From patchwork Tue Jun 23 20:39:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1315519 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=bscxrlLY; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49rynS20shz9sVw for ; Wed, 24 Jun 2020 06:39:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D678881F66; Tue, 23 Jun 2020 22:39:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bscxrlLY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8DBB581F5D; Tue, 23 Jun 2020 22:39:33 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7D04281EA2 for ; Tue, 23 Jun 2020 22:39:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x242.google.com with SMTP id e4so63174ljn.4 for ; Tue, 23 Jun 2020 13:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7iA/B6+L5gh25vXWqZlhGN0cEuCPCJGj8EmBJdl3Le8=; b=bscxrlLYdBk5G7SqYtWCUCsnO/z3itmDLu4E/eh5RgxIkxVTXhtFyEjx/Bf5QtcCxm 5ZxlK/UyWh1TjTsRvecY+OebpjLWQYpqdnmInGtxAXS/Cz9r20s0EP7MTdS+So/mex5/ UwZOu9+PUDRDcAkJZJwgFiv2Ixacgf3mIxqWpUSsWIgEL8YKJGH+D7yGdXHg3egr/1K6 qLsOb33iWane2tfbQ2IB5MVcIpIhkTrF1CFcBC6GoLBBEBxViPRIkNzoNGycpOzTcqrl NKjUBpEb3yMdCIhiBMWsSiUxYlUsRucIWfoXrw8lC4rQUuyg6as23yDxf5yCbhrBFuKk Usog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7iA/B6+L5gh25vXWqZlhGN0cEuCPCJGj8EmBJdl3Le8=; b=E6EfXTrUrPxRcvFglGA/aliFJqLSywN7ZLBwhCDbAr75wfGOGfvZzFYLZawHUbSzUx 9lC9W5H1L/Tpc9OJAqd41EexAXI3fNt1Q1w68T2frGmm3RQ/nslrs2/QKQMOtWkQpDOr /SkFKGBLomyZAyVZGhvt7favAaQgbasCb6g6xQTFN88F+2iM9OOsrdfYtQNc/BG1YytC xtkZleYZYIApts8wbTcvLlVmNFsWRqqKNSRhlGxNZ9kWJN0FffQGyNGJzud1X1PRndp1 8MdxL/fPnu+Qmaa/fGQmsKA26CCxfIkIIasoR0aI+LMQkcqKVKn50s8vqd9v5QVV/WrH VDag== X-Gm-Message-State: AOAM531qvxf9e7tpA6wOyjGubrOFe4tccajSEQeKyfuMxcHLjIZjwMH0 9qKeqBE6fZ7HTTQE2rmsfK12vKyz X-Google-Smtp-Source: ABdhPJx2yd5kNueceMCZAlL+ux2aYyLWrsJJk20Zbf61kV+7BHQiIeTSbd6deN3sw5/LuSAheDQJ3Q== X-Received: by 2002:a2e:81d4:: with SMTP id s20mr11732203ljg.248.1592944768254; Tue, 23 Jun 2020 13:39:28 -0700 (PDT) Received: from localhost ([194.44.43.171]) by smtp.gmail.com with ESMTPSA id d2sm4441687lfq.79.2020.06.23.13.39.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jun 2020 13:39:27 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, stefan.agner@toradex.com, sbabic@denx.de, philippe.schenker@toradex.com, Igor Opaniuk , Fabio Estevam , "NXP i.MX U-Boot Team" , Tom Rini Subject: [PATCH v1 1/6] ARM: dts: imx6ull-colibri: move u-boot specific node Date: Tue, 23 Jun 2020 23:39:20 +0300 Message-Id: <1592944765-28704-1-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Move aliases and legacy lcdif node to the u-boot specific dts include. Signed-off-by: Igor Opaniuk --- arch/arm/dts/imx6ull-colibri-u-boot.dtsi | 45 ++++++++++++++++++++++++++++++++ arch/arm/dts/imx6ull-colibri.dtsi | 43 ------------------------------ 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi index 531cdcc..9b66dda 100644 --- a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi +++ b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi @@ -3,6 +3,15 @@ * Copyright 2019 Toradex AG */ +/ { + aliases { + u-boot,dm-pre-reloc; + mmc0 = &usdhc1; + usb0 = &usbotg1; /* required for ums */ + display0 = &lcdif; + }; +}; + &pinctrl_uart1 { u-boot,dm-pre-reloc; }; @@ -10,3 +19,39 @@ &pinctrl_uart1_ctrl1 { u-boot,dm-pre-reloc; }; + +&lcdif { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcdif_dat + &pinctrl_lcdif_ctrl>; + status = "okay"; + display = <&display0>; + u-boot,dm-pre-reloc; + + display0: display0 { + bits-per-pixel = <18>; + bus-width = <24>; + status = "okay"; + + display-timings { + native-mode = <&timing_vga>; + timing_vga: 640x480 { + u-boot,dm-pre-reloc; + clock-frequency = <25175000>; + hactive = <640>; + vactive = <480>; + hback-porch = <48>; + hfront-porch = <16>; + vback-porch = <33>; + vfront-porch = <10>; + hsync-len = <96>; + vsync-len = <2>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; + }; + }; +}; diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi index fca5311..b7bf79f 100644 --- a/arch/arm/dts/imx6ull-colibri.dtsi +++ b/arch/arm/dts/imx6ull-colibri.dtsi @@ -8,13 +8,6 @@ #include "imx6ull.dtsi" / { - aliases { - u-boot,dm-pre-reloc; - mmc0 = &usdhc1; - usb0 = &usbotg1; /* required for ums */ - display0 = &lcdif; - }; - chosen { stdout-path = &uart1; }; @@ -151,42 +144,6 @@ }; }; -&lcdif { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lcdif_dat - &pinctrl_lcdif_ctrl>; - status = "okay"; - display = <&display0>; - u-boot,dm-pre-reloc; - - display0: display0 { - bits-per-pixel = <18>; - bus-width = <24>; - status = "okay"; - - display-timings { - native-mode = <&timing_vga>; - timing_vga: 640x480 { - u-boot,dm-pre-reloc; - clock-frequency = <25175000>; - hactive = <640>; - vactive = <480>; - hback-porch = <48>; - hfront-porch = <16>; - vback-porch = <33>; - vfront-porch = <10>; - hsync-len = <96>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - }; - }; -}; - /* PWM */ &pwm4 { pinctrl-names = "default";