From patchwork Wed Jul 15 10:31:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1329368 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=OghblyLA; 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 4B6DHM0bLgz9sTM for ; Wed, 15 Jul 2020 20:33:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1CD0B81F24; Wed, 15 Jul 2020 12:32:04 +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="OghblyLA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CE67481C24; Wed, 15 Jul 2020 12:31:41 +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-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) (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 24D5181EE3 for ; Wed, 15 Jul 2020 12:31:37 +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-x244.google.com with SMTP id h22so1967220lji.9 for ; Wed, 15 Jul 2020 03:31:37 -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:in-reply-to:references; bh=U5KgNMFd++FE5nKD3LuCuj+mnC9eLQNLHKKK8adrYXE=; b=OghblyLAO1T00bMBJv2rPyKghiAtKqBmMIwdCO0uQsMJoX1UgOYv43CYfU19zj1JxU Z74hRD9J4QvbKKUZpaaqlfpSmz9+At7kP5fNcpMWXKe2GqKxvBwjl0VCzvgJINPnclaA PIqMTBTZ94INxYVw1Pr7Fi78ApIwxVJOgnWTWB6Dt0GI8Dy+4/mZ6PpMdOLA/ygRCQKI Z0+Qbw4NT7MSvCqi2rBI2eoIPeBWWcFGBAkqwJYA+lXcgPP/ca2M9NZUmNZSiGVpYfQh KqO5LSbf6uIhWvKRmPrMOTpNp7sL5v/b+RWax4Iy8oeXNIJXvWl+u/LMBuXGRckrqsIn PxtQ== 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:in-reply-to :references; bh=U5KgNMFd++FE5nKD3LuCuj+mnC9eLQNLHKKK8adrYXE=; b=HxM+PuaFL9TRNKjY3DxHgj34NpgWDvGKHedsIcyeBhMsMQ5lvY0pxL0M3uaakdYnoC ZUNKFPWXL3hov87ztqF5RdDBBXBgImEN9QcNgi/2/OShnckGxX7itDCGCyjaECzbSCdX uw9kanpqpSDQNug9RTbQy1TI05cqShhaACcJSOK1LHz6KHlB17+Op7Q/amgsp1sPi2GI CEGshGe1b0hxaKgUzJy0nkihgVyXrPG0tRBNWzIb6Kf97dP1I4knjZ9eGTbNKra59ffX 5rOJ4hpon6HerOxZHW7PASASAdVqsHMXb5yss7SbqBFOZbPG3ocs1YxqV1MJytU/YM8c oz7A== X-Gm-Message-State: AOAM532nL1cj5aFbQ3mnTGVQ2XNGi1MDD+arbvWsuI73YoFVQOAdpHO0 cVEUINK1GiHQQcHK6H8UhLtp816dLHw= X-Google-Smtp-Source: ABdhPJwtxzEfRtLEO4XppWe0AG/WdBp0aHi0CB0U6X44rRu5JK+kG0nnZpO8iC90n0yp67LB/USrbg== X-Received: by 2002:a2e:9c95:: with SMTP id x21mr4505443lji.234.1594809095832; Wed, 15 Jul 2020 03:31:35 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id n25sm373854lji.28.2020.07.15.03.31.34 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 03:31:35 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marcel Ziswiler , Max Krummenacher , festevam@gmail.com, peng.fan@nxp.com, Oleksandr Suvorov , Igor Opaniuk , "NXP i.MX U-Boot Team" Subject: [PATCH v2 09/14] ARM: dts: imx6ull-colibri: move u-boot specific node Date: Wed, 15 Jul 2020 13:31:00 +0300 Message-Id: <20200715103105.8622-10-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715103105.8622-1-igor.opaniuk@gmail.com> References: <20200715103105.8622-1-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk 1. Move aliases and legacy lcdif node to the u-boot specific dts include. 2. Provide proper display timings, as in the downstream Toradex kernel [1]. [1]: https://git.toradex.com/cgit/linux-toradex.git/tree/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi?h=toradex_4.9-2.3.x-imx#n183 Signed-off-by: Igor Opaniuk --- (no changes since v1) 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 531cdcc4da..afdb0f43cf 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 = <40>; + hfront-porch = <24>; + vback-porch = <32>; + vfront-porch = <11>; + 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 fca53119fe..b7bf79f28c 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";