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"; From patchwork Tue Jun 23 20:39:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1315521 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=Jq5N+52H; 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 49ryp32kPjz9sVT for ; Wed, 24 Jun 2020 06:40:11 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D996481F67; Tue, 23 Jun 2020 22:39:48 +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="Jq5N+52H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BCCAC81F72; Tue, 23 Jun 2020 22:39:39 +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 C056181F53 for ; Tue, 23 Jun 2020 22:39:30 +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 i3so71022ljg.3 for ; Tue, 23 Jun 2020 13:39:30 -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=EgCdx2M5hwdbYjGaj38MjQAXP/EEIIHStSb+icWZ+Cs=; b=Jq5N+52HamsWc5aCfqflYeorYqlSo/U0bQmCgOP0P7575ExFcE4j8/fLXDkGDZs8sR y2+Yii6CmRy8I9CPNoox96Nh9SFCtiYJyn6rkNElgiTBdAelOPQAQ7RbUkXNPnmAfXJm O4UU8gwGtA9wm21Hxnvqx4lzR2GJY0sDR71DFEEhPpgyW1D/JS/FjJXQWcpn9YWDjME6 wvlX3moZYIiSSoG3vTo6kgr0tTBmUOhmqZ5YZ3PW0jcfiypiRsDz7ounGrQzEyaDh3Ee GEApBwDiWcurMSQQYnxUAnTxVsU3u/sIQHkm6oQt7MfzJHIlWt0cFa0eJBBnJZGd7LzJ uySQ== 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=EgCdx2M5hwdbYjGaj38MjQAXP/EEIIHStSb+icWZ+Cs=; b=sSxWq7nIPvWaFp1gte3+NXa7SW0N4wMHU3LjGwgIWs6CSJOKQIBc/ZnADFHmGmCWIb xW6yai59ZdaY5PLyF6yND+LjuCZoPvfEl+80i9DkdrKo4UWFihB3k2Jbqgt8t3ZlciO/ S9Vb3g3Brxgh7Un8KU+wx0iv+k1kquXLereedjCw1ALgcM4xtbvPLxoYUgMECA5eGnge WX+x1zDamTyCcOR4JdsZj8oRSU68ZcVqSVPQygayansh4od0mMtaPVFUevc6cQ8HTnlP VU+Sqhc495gau/0GUjHFTaHciPmFopmnwi1vawcUpQyL0j1K2BFwUFXCaK4tVNmzUa9l YqGw== X-Gm-Message-State: AOAM533kJMlq3eGcZ4RYOT/uTa/NQPXfkWP3h8R8P49ilSFGqycQUuFE xB/AGW9FwEKSsTZK8mpNP4Cx3HY+ X-Google-Smtp-Source: ABdhPJw6R2Z2TPPHMjaCjblwn7GUelGVwwm87tPev8XMYp0Luw6rVSKXVesOL6txa5IWvsNSSHvrqQ== X-Received: by 2002:a05:651c:213:: with SMTP id y19mr11357604ljn.232.1592944769790; Tue, 23 Jun 2020 13:39:29 -0700 (PDT) Received: from localhost ([194.44.43.171]) by smtp.gmail.com with ESMTPSA id x64sm2359852lff.14.2020.06.23.13.39.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jun 2020 13:39:29 -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 , Joe Hershberger , Simon Glass Subject: [PATCH v1 2/6] toradex: common: show boot logo Date: Tue, 23 Jun 2020 23:39:21 +0300 Message-Id: <1592944765-28704-2-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592944765-28704-1-git-send-email-igor.opaniuk@gmail.com> References: <1592944765-28704-1-git-send-email-igor.opaniuk@gmail.com> 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 Add function for showing boot logo, embed into u-boot blob. Signed-off-by: Igor Opaniuk --- board/toradex/common/tdx-common.c | 26 ++++++++++++++++++++++++++ board/toradex/common/tdx-common.h | 4 ++++ 2 files changed, 30 insertions(+) diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index e8de923..9b6c8f9 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -9,6 +9,13 @@ #include #include +#ifdef CONFIG_DM_VIDEO +#include +#include +#include +#include +#endif + #include "tdx-cfg-block.h" #include #include "tdx-common.h" @@ -168,3 +175,22 @@ int ft_common_board_setup(void *blob, bd_t *bd) } #endif /* CONFIG_TDX_CFG_BLOCK */ + +#if defined(CONFIG_DM_VIDEO) +int show_boot_logo(void) +{ + struct udevice *dev; + int ret; + int xpos, ypos; + + splash_get_pos(&xpos, &ypos); + + ret = uclass_get_device(UCLASS_VIDEO, 0, &dev); + if (ret) + return ret; + + ret = video_bmp_display(dev, (ulong)bmp_logo_bitmap, xpos, ypos, true); + + return ret; +} +#endif /* CONFIG_DM_VIDEO */ diff --git a/board/toradex/common/tdx-common.h b/board/toradex/common/tdx-common.h index c537dca..63614c8 100644 --- a/board/toradex/common/tdx-common.h +++ b/board/toradex/common/tdx-common.h @@ -11,4 +11,8 @@ int ft_common_board_setup(void *blob, bd_t *bd); +#if defined(CONFIG_DM_VIDEO) +int show_boot_logo(void); +#endif + #endif /* _TDX_COMMON_H */ From patchwork Tue Jun 23 20:39:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1315520 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=vTngiqLh; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 49rynk0yGKz9sVW for ; Wed, 24 Jun 2020 06:39:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 470BB81F73; Tue, 23 Jun 2020 22:39:41 +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="vTngiqLh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2DBD381F70; Tue, 23 Jun 2020 22:39:37 +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-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) (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 AFCC181EA2 for ; Tue, 23 Jun 2020 22:39:33 +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-lf1-x12d.google.com with SMTP id y13so62335lfe.9 for ; Tue, 23 Jun 2020 13:39:33 -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=hi7YNsx13+O4Q3Je1ZPaQBx32S70i6lV2myx83mCwBc=; b=vTngiqLhIqCnQPbEpTAZ+fRPtVpZJV0QIhUxdQERzNJwBgehsR9A/4wvLIp1rCLHjs u5CrlCyuT5TI5PGGxgmgd7Yeoz3+2Oz8wY+gggrDy82FedWjyqjIMRQDeds1a9s5Kaa4 w9QqgoCUF1vltV9ZBeKp8uWScRT5/tOx+EKvvhU67hHEJIr9izgnOAsudXDtvZiB8SCU yXwdUcU/IUqFtmWImmKs5qVQGcun96FM4RES4e9eCyKc6bAy0YyKetReh8ZjnEkHV+vB lSt3osoHPRouIitYiKLU+H0iWbZ7OvXzmT91hz02vjpuugWTSERItRO87XLM6NwI/7mT YZRg== 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=hi7YNsx13+O4Q3Je1ZPaQBx32S70i6lV2myx83mCwBc=; b=B6xpmXFscwvuYwVZhE/AzioFWgmI4fyyi8Zjb5xTjjpxVvC1Z+3rBap9cQCLtm1e2x d8JDH2zLtehkE2LoN2d3nzz2veD5v7OWYYe4B2nYMdd8iVYT3VkJ37lCYy52NC2wx2eF 9O8QpesavtjoboXhlQcXcdx4p6iA19g3ZH5JMtxxwSQwJfc/D2ZJwRfGpgjZWTKNYkgg uiGCAlTmbYHo6L3qPibckBy0NuSZDHwgDEfHsN1FVeS0ayeakOE32ibz9YSCT2KOAeig 7tFEfi4TJXdNqht3c7jAHF4rIkTqdhdeB4gdi/kb+iVKO04wxXC757YmXzVFshtOC0yF RgTg== X-Gm-Message-State: AOAM531X3m5DgGpWF+t6I15NBXT7jYauSuWHT/KBlc/65M3n7KgyCO4q EPUy9hUXlOUGg5iN07TQ6Jj7EvzK X-Google-Smtp-Source: ABdhPJxFJyDpsL2ZnZUGzAzBWObI8YeZmPsmuJXXqa3cXt2RWIIeGsP2P1SjsNZfq3FUAkwIZoS6CA== X-Received: by 2002:a19:4805:: with SMTP id v5mr9995471lfa.75.1592944771407; Tue, 23 Jun 2020 13:39:31 -0700 (PDT) Received: from localhost ([194.44.43.171]) by smtp.gmail.com with ESMTPSA id s18sm4097539ljj.63.2020.06.23.13.39.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jun 2020 13:39:30 -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 3/6] ARM: dts: imx7-colibri: multiple node updates Date: Tue, 23 Jun 2020 23:39:22 +0300 Message-Id: <1592944765-28704-3-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592944765-28704-1-git-send-email-igor.opaniuk@gmail.com> References: <1592944765-28704-1-git-send-email-igor.opaniuk@gmail.com> 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 1. Move u-boot specific nodes to u-boot dts include: legacy lcdif node and aliases. 2. Add iomux configuration for LCD. Signed-off-by: Igor Opaniuk --- arch/arm/dts/imx7-colibri-emmc.dts | 9 +---- arch/arm/dts/imx7-colibri-rawnand.dts | 5 +-- arch/arm/dts/imx7-colibri-u-boot.dtsi | 48 +++++++++++++++++++++++++ arch/arm/dts/imx7-colibri.dtsi | 65 +++++++++++++++++----------------- board/toradex/colibri_imx7/MAINTAINERS | 1 + 5 files changed, 83 insertions(+), 45 deletions(-) create mode 100644 arch/arm/dts/imx7-colibri-u-boot.dtsi diff --git a/arch/arm/dts/imx7-colibri-emmc.dts b/arch/arm/dts/imx7-colibri-emmc.dts index bc0d10c..dda542a 100644 --- a/arch/arm/dts/imx7-colibri-emmc.dts +++ b/arch/arm/dts/imx7-colibri-emmc.dts @@ -5,19 +5,12 @@ /dts-v1/; #include "imx7-colibri.dtsi" +#include "imx7-colibri-u-boot.dtsi" / { model = "Toradex Colibri iMX7D 1GB (eMMC)"; compatible = "toradex,imx7d-colibri-emmc", "fsl,imx7d"; - aliases { - u-boot,dm-pre-reloc; - mmc0 = &usdhc3; - mmc1 = &usdhc1; - display1 = &lcdif; - usb0 = &usbotg1; /* required for ums */ - }; - chosen { stdout-path = &uart1; }; diff --git a/arch/arm/dts/imx7-colibri-rawnand.dts b/arch/arm/dts/imx7-colibri-rawnand.dts index 5f12a2a..5241044 100644 --- a/arch/arm/dts/imx7-colibri-rawnand.dts +++ b/arch/arm/dts/imx7-colibri-rawnand.dts @@ -5,6 +5,7 @@ /dts-v1/; #include "imx7-colibri.dtsi" +#include "imx7-colibri-u-boot.dtsi" / { model = "Toradex Colibri iMX7S/D"; @@ -14,10 +15,6 @@ stdout-path = &uart1; }; - aliases { - usb0 = &usbotg1; /* required for ums */ - }; - reg_5v0: regulator-5v0 { compatible = "regulator-fixed"; regulator-name = "5V"; diff --git a/arch/arm/dts/imx7-colibri-u-boot.dtsi b/arch/arm/dts/imx7-colibri-u-boot.dtsi new file mode 100644 index 0000000..b1a89f0 --- /dev/null +++ b/arch/arm/dts/imx7-colibri-u-boot.dtsi @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * Copyright 2020 Toradex + */ +/{ + aliases { + mmc0 = &usdhc3; + mmc1 = &usdhc1; + display1 = &lcdif; + usb0 = &usbotg1; /* required for ums */ + u-boot,dm-pre-reloc; + }; +}; + +&lcdif { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcdif_dat + &pinctrl_lcdif_ctrl>; + display = <&display0>; + u-boot,dm-pre-reloc; + + display0: display0 { + bits-per-pixel = <18>; + bus-width = <18>; + status = "okay"; + + display-timings { + native-mode = <&timing_vga>; + timing_vga: 640x480 { + clock-frequency = <25175000>; + hactive = <640>; + vactive = <480>; + hback-porch = <48>; + hfront-porch = <16>; + vback-porch = <31>; + 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/imx7-colibri.dtsi b/arch/arm/dts/imx7-colibri.dtsi index ec95f22..b352036 100644 --- a/arch/arm/dts/imx7-colibri.dtsi +++ b/arch/arm/dts/imx7-colibri.dtsi @@ -172,6 +172,38 @@ >; }; + pinctrl_lcdif_dat: lcdif-dat-grp { + fsl,pins = < + MX7D_PAD_LCD_DATA00__LCD_DATA0 0x79 + MX7D_PAD_LCD_DATA01__LCD_DATA1 0x79 + MX7D_PAD_LCD_DATA02__LCD_DATA2 0x79 + MX7D_PAD_LCD_DATA03__LCD_DATA3 0x79 + MX7D_PAD_LCD_DATA04__LCD_DATA4 0x79 + MX7D_PAD_LCD_DATA05__LCD_DATA5 0x79 + MX7D_PAD_LCD_DATA06__LCD_DATA6 0x79 + MX7D_PAD_LCD_DATA07__LCD_DATA7 0x79 + MX7D_PAD_LCD_DATA08__LCD_DATA8 0x79 + MX7D_PAD_LCD_DATA09__LCD_DATA9 0x79 + MX7D_PAD_LCD_DATA10__LCD_DATA10 0x79 + MX7D_PAD_LCD_DATA11__LCD_DATA11 0x79 + MX7D_PAD_LCD_DATA12__LCD_DATA12 0x79 + MX7D_PAD_LCD_DATA13__LCD_DATA13 0x79 + MX7D_PAD_LCD_DATA14__LCD_DATA14 0x79 + MX7D_PAD_LCD_DATA15__LCD_DATA15 0x79 + MX7D_PAD_LCD_DATA16__LCD_DATA16 0x79 + MX7D_PAD_LCD_DATA17__LCD_DATA17 0x79 + >; + }; + + pinctrl_lcdif_ctrl: lcdif-ctrl-grp { + fsl,pins = < + MX7D_PAD_LCD_CLK__LCD_CLK 0x79 + MX7D_PAD_LCD_ENABLE__LCD_ENABLE 0x79 + MX7D_PAD_LCD_VSYNC__LCD_VSYNC 0x79 + MX7D_PAD_LCD_HSYNC__LCD_HSYNC 0x79 + >; + }; + pinctrl_enet1: enet1grp { fsl,pins = < MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x14 @@ -227,36 +259,3 @@ >; }; }; - -&lcdif { - 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/board/toradex/colibri_imx7/MAINTAINERS b/board/toradex/colibri_imx7/MAINTAINERS index 82246be..61a5044 100644 --- a/board/toradex/colibri_imx7/MAINTAINERS +++ b/board/toradex/colibri_imx7/MAINTAINERS @@ -9,5 +9,6 @@ F: include/configs/colibri_imx7.h F: configs/colibri_imx7_defconfig F: configs/colibri_imx7_emmc_defconfig F: arch/arm/dts/imx7-colibri.dtsi +F: arch/arm/dts/imx7-colibri-u-boot.dtsi F: arch/arm/dts/imx7-colibri-emmc.dts F: arch/arm/dts/imx7-colibri-rawnand.dts From patchwork Tue Jun 23 20:39:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1315522 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=rgQj8ROM; 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 49rypL1R48z9sV1 for ; Wed, 24 Jun 2020 06:40:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6703981F5B; Tue, 23 Jun 2020 22:39:52 +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="rgQj8ROM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E0EAC81F5B; Tue, 23 Jun 2020 22:39: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,UPPERCASE_50_75, URIBL_BLOCKED autolearn=no 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 7883681F5B for ; 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=igor.opaniuk@gmail.com Received: by mail-lj1-x244.google.com with SMTP id n23so44863ljh.7 for ; Tue, 23 Jun 2020 13:39:34 -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=2wjus76d4HfBpKbDrWJD6CQmWF1dXOgYWn8CAFdaZlo=; b=rgQj8ROMF2AgJbNvInH8dWUK+e//+fnvXdcoDq37JaB49imhT/JPqj06gzmtjAdyJs e9h823oUeU5cXoy/f5UQWaBzk5NnNcFU0Rr+J5DTVGPwN+2a8ad4l8ybw9zQDH642QUE kEIKhFopkzi5f9juXFjbRJpQ9zE89d1ffEQQo/TobeP20ug5E5u2WEySM/bK6w3dSNCy M8GMjBBxMl53WhpXId6M9WPF8Tsc8WEd0snT6zWsQFcbu10ypBC6OHnn9sc/XVEFPVnX 7dSHcvSf3LrlSX9zeZe4Su1jner63K8QTSphgpt5Btkn0urVn5b62fUniqCuox3ABycO rk8g== 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=2wjus76d4HfBpKbDrWJD6CQmWF1dXOgYWn8CAFdaZlo=; b=G7IdVRsAN/P6WLUP/Ncr/RLbXUUzvdPLJWI3zBXp0v07rTC1HmBV9y3SwXsD632ZLK eRIb9BeUZeu2ESE4OBqq3wG8TcEI9obYorJjj4TvsgpShCaRBdP50WIb7K0zF1arBvz3 RmCv+4sPtZf0mNUf7egGm5bBAIJ0pKI9Kf4mjHWu7ArfU03tfNRC+NCkA5QclR2ymO6+ RN4k/uAfuQf/XaMA1Q1laVD/J1FudUn+VnGUJO4HL6L6DMpuS7K0UPihX4XBOq40HQ+9 VaZAL1JIq58L0L/ba2bBghPyMtxzl3CHNf55K54+nNqO9upuXXsmK5p4g0q+NqJrj0Ze 2EIQ== X-Gm-Message-State: AOAM5317zJKdTmiXt8ViZc8HO4XNj0uODaYmDEPDYOAtqUoKUEL8Yp1V ph0DGHs1UILYdfalrixQy1z0Luxr X-Google-Smtp-Source: ABdhPJzJJhHKteJNaA5L+WUAUOlQDGg9PRGvpInIF17QJY+eEV3D0zSEIGvvW8nlIiMSHz/tl4DHSg== X-Received: by 2002:a2e:8e8d:: with SMTP id z13mr503502ljk.215.1592944773050; Tue, 23 Jun 2020 13:39:33 -0700 (PDT) Received: from localhost ([194.44.43.171]) by smtp.gmail.com with ESMTPSA id n1sm3508917ljg.131.2020.06.23.13.39.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jun 2020 13:39:32 -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 Subject: [PATCH v1 4/6] colibri-imx6ull: show boot logo Date: Tue, 23 Jun 2020 23:39:23 +0300 Message-Id: <1592944765-28704-4-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592944765-28704-1-git-send-email-igor.opaniuk@gmail.com> References: <1592944765-28704-1-git-send-email-igor.opaniuk@gmail.com> 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 1. Show boot logo embed in U-Boot blob. 2. Drop iomux configration for LCD, and use the one provided in device tree. Signed-off-by: Igor Opaniuk --- board/toradex/colibri-imx6ull/colibri-imx6ull.c | 40 +++++-------------------- 1 file changed, 7 insertions(+), 33 deletions(-) diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index c67d02f..8a34872 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -57,32 +57,7 @@ static void setup_gpmi_nand(void) } #endif /* CONFIG_NAND_MXS */ -#ifdef CONFIG_VIDEO_MXS -static iomux_v3_cfg_t const lcd_pads[] = { - MX6_PAD_LCD_CLK__LCDIF_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_ENABLE__LCDIF_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_HSYNC__LCDIF_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_CLK__LCDIF_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA00__LCDIF_DATA00 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA01__LCDIF_DATA01 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA02__LCDIF_DATA02 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA03__LCDIF_DATA03 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA04__LCDIF_DATA04 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA05__LCDIF_DATA05 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA06__LCDIF_DATA06 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA07__LCDIF_DATA07 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA08__LCDIF_DATA08 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA09__LCDIF_DATA09 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA10__LCDIF_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA11__LCDIF_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA12__LCDIF_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA13__LCDIF_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA14__LCDIF_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA15__LCDIF_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA16__LCDIF_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX6_PAD_LCD_DATA17__LCDIF_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL), -}; - +#ifdef CONFIG_DM_VIDEO static iomux_v3_cfg_t const backlight_pads[] = { /* Backlight On */ MX6_PAD_JTAG_TMS__GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL), @@ -95,8 +70,6 @@ static iomux_v3_cfg_t const backlight_pads[] = { static int setup_lcd(void) { - imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); - imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads)); /* Set BL_ON */ @@ -153,11 +126,6 @@ int board_init(void) #ifdef CONFIG_NAND_MXS setup_gpmi_nand(); #endif - -#ifdef CONFIG_VIDEO_MXS - setup_lcd(); -#endif - return 0; } @@ -203,6 +171,12 @@ int board_late_init(void) } #endif /* CONFIG_CMD_USB_SDP */ +#if defined(CONFIG_DM_VIDEO) + setup_lcd(); + + show_boot_logo(); +#endif + return 0; } From patchwork Tue Jun 23 20:39:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1315523 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=LnDGT7Ih; 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 49rypf3HLqz9sVb for ; Wed, 24 Jun 2020 06:40:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 93E6581F80; Tue, 23 Jun 2020 22:39:53 +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="LnDGT7Ih"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0326F81F70; Tue, 23 Jun 2020 22:39:42 +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-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) (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 8A2F781F6A for ; Tue, 23 Jun 2020 22:39:35 +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-x235.google.com with SMTP id 9so58217ljv.5 for ; Tue, 23 Jun 2020 13:39:35 -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=ImikNAsgiHWsXTN7j3A53a32Q/ZrZig1mikToHFyMnE=; b=LnDGT7Ih3LWN6j+684gnOb4F+s1wjuNW7xmOcPBCg0h5iGLJ2HWd5pBjTAotVGUdH2 eVgRae0gxamtdCN18ljUMcrOm7xTneAA1p+855Cd3lmfR26ubi6i2pr5f9DGtQCqdw4p xUCQ+4qXJLFWFrbMvH77mPHX042SKQ4BJ/OcYKWNxe5r+uZTbDlwlrFdO2Q+vGQ8rJ+b OuMxfzSUl75ylM5ksABXT3KgnBREeR4ED+vNLeww1dIjmtqOwmh/qjN/0J8pAkQTnjn0 bp9/T8/WrB89R6433Knf7CIAonrj3tSN982bgD8DjkEHJDJk8fSTioxuFYb2pv476zUe wzOg== 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=ImikNAsgiHWsXTN7j3A53a32Q/ZrZig1mikToHFyMnE=; b=MLMOFhYa2ChMgGsEC+9cyP9KAiclw8AZtqciSRM/els30r8DzT1KHGhCrfbuNXAx0g iXZcfjWv9uEKdSsg8de0GGOvkQI1tWb4uPqY1ujbpow9UDkE9NJipaU14lZkMCTVuIKq 8gQZnL0Nq+SzGLoH6C+neyTJejdyJ4RJMOKYfx/JgN/QND34PBtukuaf+jhOZ3YuOfup yHEVYIbTjks3Sjb9ffjdhpi8lHXgN9B0CuTFyX+DqVadBsQ8HtAekfmNE+iQacvq4+y1 thRDSiF4l1Zk8JHU/yFjoSaBurKJWYxPgX6rDNrFbCgWmGxw1erdRYY37iV7CmeAEAp1 Mk7A== X-Gm-Message-State: AOAM5302VdOT00i3XrMPEmi0nHUejKdhIKYMIgDC578IJjGCB3ipE2az 4sOzw2zR5bhQwGOjxAAzV/MzDe/F X-Google-Smtp-Source: ABdhPJxR0nzG49VL/FdyPyxpzLrq3Z9AGN66Oi92M+OzqRyctA2BcdI9dDZVcIKsWiTohEjjc9U+0A== X-Received: by 2002:a2e:6a11:: with SMTP id f17mr11456055ljc.109.1592944774623; Tue, 23 Jun 2020 13:39:34 -0700 (PDT) Received: from localhost ([194.44.43.171]) by smtp.gmail.com with ESMTPSA id 190sm645508ljf.38.2020.06.23.13.39.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jun 2020 13:39:34 -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 Subject: [PATCH v1 5/6] colibri-imx6ull: fix splash screen logo drawing Date: Tue, 23 Jun 2020 23:39:24 +0300 Message-Id: <1592944765-28704-5-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592944765-28704-1-git-send-email-igor.opaniuk@gmail.com> References: <1592944765-28704-1-git-send-email-igor.opaniuk@gmail.com> 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 Configure white on black for video console. Signed-off-by: Igor Opaniuk --- configs/colibri-imx6ull_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 74a67a0..34ab8d6 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -88,3 +88,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y +CONFIG_SYS_WHITE_ON_BLACK=y From patchwork Tue Jun 23 20:39:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1315524 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=RRGW0p2y; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 49rypt1PKxz9sVd for ; Wed, 24 Jun 2020 06:40:54 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BF38F81F89; Tue, 23 Jun 2020 22:39:54 +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="RRGW0p2y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 74EC881F5B; Tue, 23 Jun 2020 22:39:42 +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-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) (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 7BC9781EA2 for ; Tue, 23 Jun 2020 22:39: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-x22b.google.com with SMTP id 9so58308ljv.5 for ; Tue, 23 Jun 2020 13:39: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=6r3KT4pLJvR3tmjf/Sn41yY5jGy/fQAxVTNqDjPW6Q8=; b=RRGW0p2yDJgQhM3v8zEBcKuI1DbO6m9lV4+WkuG1IxqyCtatzJpzCiI/0gsHKtdO/R 3D7PO5iPmDHWbmXMGh+EyD7hD+vvfUI/4x9A4LRu+rs2X3zWGGGFvMWkIjrcfQTkqOkx 6k1RO873Di2qnt4g7cdW1AcMaxDOIkXXdm5ZN8NtiViPifXfBXOzctqbxjTMGfqQkevR jKL+Cobd9+LeSWSt8IoQffDp3Y1ScNqeV7bZG2YZt48pT28hpResy7i+adrUWP5lI22A zAfRs07MchcvFGmiDPUgwqFO0BHfFyL2AhD0RTUR6zhf7FMjfg4Uus1uC/VGSLv9++dQ 9O+Q== 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=6r3KT4pLJvR3tmjf/Sn41yY5jGy/fQAxVTNqDjPW6Q8=; b=KV22OJF1Xa6JFuirl0ljmtM34Gl2YM3fMP3dDYCcPrtx1K5kTZ624borx9P4FaWDP2 dwvAwCZWG9zpAcrrkWRdn3063PyZ8rNZart4eAPxVeSRajldmQ8AC8POQiO+ga3dK0bw e7IRi8829NKnYwCwqCBwIutg3T0tHpR66AOhCx2rkh5e3YJm4Dmwlq/CzBCnIixLWsra ksqIuGj6Uk5CE6oJKC1U8kNfXkos9tlNjVCpWbuoCcTZchGf1ZEI0ufI/PDmscy7BqVX DV9M/AkVH1uFfGdD6ry+Y4SrYB40JPUsQaIrxdH0qMtGdVQi6DeftnEe9MQ15l0MhBbv tkoQ== X-Gm-Message-State: AOAM532phT6Fgqi+NCVGljt/n8Z6YDs0QKfbIGNJWDBrc24NGXsnToHV Zn3VVWbQ5xrYYPRlTXkLnn3gn6lh X-Google-Smtp-Source: ABdhPJw+O3kVE3O715Bbe5I4xsvJA6mC4Rzb9Qp2Hq8ih8oPj3hBtQ0obfMzj6QjEs+inzBlHyig3A== X-Received: by 2002:a2e:b4e7:: with SMTP id s7mr11433226ljm.336.1592944776418; Tue, 23 Jun 2020 13:39:36 -0700 (PDT) Received: from localhost ([194.44.43.171]) by smtp.gmail.com with ESMTPSA id d8sm4443470lfa.16.2020.06.23.13.39.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jun 2020 13:39:35 -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 Subject: [PATCH v1 6/6] colibri-imx7: fix splash logo drawing Date: Tue, 23 Jun 2020 23:39:25 +0300 Message-Id: <1592944765-28704-6-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592944765-28704-1-git-send-email-igor.opaniuk@gmail.com> References: <1592944765-28704-1-git-send-email-igor.opaniuk@gmail.com> 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 1. Configure white on black for video console. 2. Enable printing bmp logo during late board init stage. 3. Use iomux configuration from device tree. Signed-off-by: Igor Opaniuk --- board/toradex/colibri_imx7/colibri_imx7.c | 44 +++++++++---------------------- configs/colibri_imx7_defconfig | 2 ++ configs/colibri_imx7_emmc_defconfig | 2 ++ 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index 8df925d..f585260 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -100,32 +100,7 @@ static void setup_gpmi_nand(void) } #endif -#ifdef CONFIG_VIDEO_MXS -static iomux_v3_cfg_t const lcd_pads[] = { - MX7D_PAD_LCD_CLK__LCD_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_ENABLE__LCD_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_HSYNC__LCD_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_VSYNC__LCD_VSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA00__LCD_DATA0 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA01__LCD_DATA1 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA02__LCD_DATA2 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA03__LCD_DATA3 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA04__LCD_DATA4 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA05__LCD_DATA5 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA06__LCD_DATA6 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA07__LCD_DATA7 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA08__LCD_DATA8 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA09__LCD_DATA9 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA10__LCD_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA11__LCD_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA12__LCD_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA13__LCD_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA14__LCD_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA15__LCD_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA16__LCD_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA17__LCD_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL), -}; - +#ifdef CONFIG_DM_VIDEO static iomux_v3_cfg_t const backlight_pads[] = { /* Backlight On */ MX7D_PAD_SD1_WP__GPIO5_IO1 | MUX_PAD_CTRL(NO_PAD_CTRL), @@ -139,8 +114,6 @@ static iomux_v3_cfg_t const backlight_pads[] = { static int setup_lcd(void) { - imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); - imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads)); /* Set BL_ON */ @@ -215,10 +188,6 @@ int board_init(void) setup_gpmi_nand(); #endif -#ifdef CONFIG_VIDEO_MXS - setup_lcd(); -#endif - #ifdef CONFIG_USB_EHCI_MX7 imx_iomux_v3_setup_multiple_pads(usb_cdet_pads, ARRAY_SIZE(usb_cdet_pads)); gpio_request(USB_CDET_GPIO, "usb-cdet-gpio"); @@ -382,4 +351,15 @@ int board_usb_phy_mode(int port) return USB_INIT_HOST; } } + +int board_late_init(void) +{ +#if defined(CONFIG_DM_VIDEO) + setup_lcd(); + + show_boot_logo(); +#endif + return 0; +} + #endif diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 7596478..aa6e240 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -87,3 +87,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y +CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig index c23ff97..a5aa35f 100644 --- a/configs/colibri_imx7_emmc_defconfig +++ b/configs/colibri_imx7_emmc_defconfig @@ -82,3 +82,5 @@ CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_WHITE_ON_BLACK=y