From patchwork Fri Dec 9 09:35:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suniel Mahesh X-Patchwork-Id: 2518 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 9C09B3F0CC for ; Fri, 9 Dec 2022 10:36:04 +0100 (CET) Received: by mail-pl1-f199.google.com with SMTP id u9-20020a170902e80900b0018939ccbeedsf3865814plg.20 for ; Fri, 09 Dec 2022 01:36:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670578563; cv=pass; d=google.com; s=arc-20160816; b=wyEREgYkUmchX49/+jEVkutaHn6y7TjUEnPNjzVkVFn9thzq2tIhuSAKZssX9trHKP t5+S8kb5lNEjJ6z5jTsplQls7ENbj8CRNSWPcqO0u0+gpC4/Irj2Tn+WN223tUdyKdxM bq9OPM26f/9f04IGdYfj88OIJ7LvISIZL5lba84x85bFjpce4zOz7VeykZFwfvM6kiyC ODAKm0YiX9ttqyrSjB62aZCI9WG+Xlv+n6/cmsP1l03HGutJtOqXqtVUfTbD5zWm36E0 SYlzcMnBUb7DmOFn2sql1dc1OwPIQBcaQlKtC9/nUzdHZbjaOQqCScv9fRqt8VKJ4MIg TqIg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=gDUQ/JF9UT1Z0vt5Lj5zj2su0kX1XFh119+qrDCnSQU=; b=A4qyfOzEoP4XZJiCP2w0Zg/7BIb5eNO2uL6GPwdG/Q7+QXJjUZKGV/T+Ebp8PqA81b bJtgHUTK3+UP8IQ3DST9yYDvFQ4KCMu0D4lF32WD7mPyw83fTseg6pFA2nu+lgbC9cVM hJo1nJ4yg+D8EYzK90zvIv06Xxbqjm8HKiX4B1zEwlWwIzRuj6biarAoXJlJ7u1nriKg kkc1gPj3DGSIuB2+Ci+w2kniytSgNOuUG5tvCC6tr1AbgdouR4+io+B8FyEGUyTEJlhE nN6utKye+j42/la3Zcl8NRlJAma1HHdOUVMaOsNXwJKCELUosbqn9rMr0Yp4dsDFFks5 2e/Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UTF7HpsS; spf=pass (google.com: domain of sunil@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=sunil@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=gDUQ/JF9UT1Z0vt5Lj5zj2su0kX1XFh119+qrDCnSQU=; b=B1geNeaUtP9U6u4v8w9Gg4zNQs+S/XbSJd+hexVuIiB8ZhC3uAoKxv8ZADZLgUad9/ Uik5q49jmafXY5SVT8ThB06Sah19RWpqWVIuJ2jjla6ppFB43kjXuktisVqYygsyZxzl +PHHJJpA0AyOVIsXDAWYRJMT+t3uY+ujWl1bo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gDUQ/JF9UT1Z0vt5Lj5zj2su0kX1XFh119+qrDCnSQU=; b=4JtqM9o4G21lx8HkJPDPuHn1gVCSA9IMZBXFkMAw10zcIzKg1ejM/Y9IxIxOJHauWB 9WddQxXieAjmMm5nN2g9SttXwxMvd7IFJ0VLlVhQvOsDA5OV2ZNWBE7Tzic/zplBYm4e 8X9XA9ke9ttYS5HbK7pkwNx9vlXFg/TzKDL0nRnJBj3TNjg2NoMQ53jqWM4pl3F8s+NO Er0xTSHZ4FZbVWQYt51s3UT4bJUzVCvWfcZ5ECfvusU1DFOrjIAOcHGbB6OY14uny9Ti QFapVVfJ/nGce5G7xDf8rvDyfcnhsuWxcjvttarEOgzW4zUZhEcbe7Tv/qa5NdlrGt/L bMtg== X-Gm-Message-State: ANoB5plCCc5D8vLfH7+EwP74w52s55AFIWvYwxKnvttjucEyXRqfpfky ZzCHF9r8ZQ76xJbOKj9lh+Y+FrK5 X-Google-Smtp-Source: AA0mqf7Ft+K5i+gruNbHN5Gm6VxIDIHFNOkIVAnnQ4JzIbZAgD7hTnFrZzkQvczCL/uBDdm6Rp2i6A== X-Received: by 2002:a17:90a:ea04:b0:219:9da1:6088 with SMTP id w4-20020a17090aea0400b002199da16088mr27436466pjy.64.1670578563036; Fri, 09 Dec 2022 01:36:03 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90a:8a94:b0:218:a5af:5c43 with SMTP id x20-20020a17090a8a9400b00218a5af5c43ls8435252pjn.3.-pod-control-gmail; Fri, 09 Dec 2022 01:36:02 -0800 (PST) X-Received: by 2002:a17:902:b612:b0:189:30cd:8fa2 with SMTP id b18-20020a170902b61200b0018930cd8fa2mr5865696pls.50.1670578562085; Fri, 09 Dec 2022 01:36:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670578562; cv=none; d=google.com; s=arc-20160816; b=XtFRZKbjonTpDGwXahnSV4OyiIvxo2I3EPZaq+ulLy56ddjaIBaB4aX436Phfb+Lrp wR3EjchY9ixUfA2Wp3E8GdGbuEdrcvRgHEp2ssqihPJMWRTVkgg+L5V/fFXCFKUOQ9av QvvudMHL2OnqThr+5xo9uhKpAfNjsdr8I14VYR33nN50ZxLlKDCwlxGRQW+MvjPKkL/f XFqWhy3gvTffT5Z5m38SqnOq/a4lJwoadG9P5XPlJEqzPC6Y6hyPiN8a4MSzmWGeymmR zBlIhl54XHB/eQttKwbDquH7Y3Sgak6csfKpq0rT5Yk1vJygMp358mY+PsXTH3z65AE8 60Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=hr4ZJtzf5ytRb9ILahBIVjzeWW0/CxoRQmTZARzrMxw=; b=0xd5SeJCSJ00zoCdxzKcAenNDih5U9JKgqTSdpL7L5c2PDXvGtMUTTIhR2kbMh1v/v ZbOmUyMFuhQX89AtomuV9F6/4KzGwrHShqpcbKSgRfDaatAhobkbHnitgDmr7hOVoZkK ipO5U2xUzIORFy9GGH2hhawvWfpcSw00vZ1l+lzXrcyqwjmpfj26sohXWKRatxgzncmz TYSGhbRXi72GcYo4pazQ14bwAFLo++0ZIuZwWgH4lt8Zd6FBvQYoIcoq643CDbfCtAyL NcHENV03ByM08zL/F/pwLc2+dNtLwC3JEE2qZmjsiD0dy+DswOgzsX/uZ5JP/8kxV48v Z6sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UTF7HpsS; spf=pass (google.com: domain of sunil@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=sunil@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id y4-20020a170902ed4400b00188fccbbe1asor644477plb.66.2022.12.09.01.36.01 for (Google Transport Security); Fri, 09 Dec 2022 01:36:02 -0800 (PST) Received-SPF: pass (google.com: domain of sunil@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:902:b209:b0:188:f0d6:ed30 with SMTP id t9-20020a170902b20900b00188f0d6ed30mr5889186plr.41.1670578561574; Fri, 09 Dec 2022 01:36:01 -0800 (PST) Received: from localhost.localdomain ([183.83.141.79]) by smtp.gmail.com with ESMTPSA id a1-20020a170902710100b00188fce6e8absm883522pll.280.2022.12.09.01.35.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Dec 2022 01:36:01 -0800 (PST) From: Suniel Mahesh To: Jagan Teki , Stefano Babic , Fabio Estevam Cc: Tom Rini , Michael Trimarchi , Dario Binacchi , linux-amarula@amarulasolutions.com, Manoj Sai , "NXP i . MX U-Boot Team" , u-boot@lists.denx.de Subject: [PATCH] engicam: imx6: migrate to DM_SERIAL Date: Fri, 9 Dec 2022 15:05:49 +0530 Message-Id: <20221209093549.4137825-1-sunil@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Original-Sender: sunil@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UTF7HpsS; spf=pass (google.com: domain of sunil@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=sunil@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Michael Trimarchi Add the needed DT overrides and configs to enable UART in SPL. Cc: Fabio Estevam Signed-off-by: Michael Trimarchi Tested-by: Suniel Mahesh Reviewed-by: Fabio Estevam --- Note: Tested this patch on Engicam Starter Kit with I.CORE - M6 (MCIMX6Q7CVT08AC) SOM. --- arch/arm/dts/imx6qdl-icore-u-boot.dtsi | 16 ++++++++++++++++ arch/arm/dts/imx6ul-isiot-u-boot.dtsi | 16 ++++++++++++++++ board/engicam/common/spl.c | 20 +++----------------- configs/imx6dl_icore_nand_defconfig | 1 + configs/imx6q_icore_nand_defconfig | 1 + configs/imx6qdl_icore_mipi_defconfig | 1 + configs/imx6qdl_icore_mmc_defconfig | 1 + configs/imx6qdl_icore_nand_defconfig | 1 + configs/imx6qdl_icore_rqs_defconfig | 1 + 9 files changed, 41 insertions(+), 17 deletions(-) diff --git a/arch/arm/dts/imx6qdl-icore-u-boot.dtsi b/arch/arm/dts/imx6qdl-icore-u-boot.dtsi index f95d49d00d..12e46e38f6 100644 --- a/arch/arm/dts/imx6qdl-icore-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-icore-u-boot.dtsi @@ -5,6 +5,22 @@ #include "imx6qdl-u-boot.dtsi" +&soc { + u-boot,dm-pre-reloc; +}; + +&aips1 { + u-boot,dm-pre-reloc; +}; + +&pinctrl_uart4 { + u-boot,dm-pre-reloc; +}; + +&uart4 { + u-boot,dm-pre-reloc; +}; + &usdhc1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx6ul-isiot-u-boot.dtsi b/arch/arm/dts/imx6ul-isiot-u-boot.dtsi index aa8e9804bf..7213e71989 100644 --- a/arch/arm/dts/imx6ul-isiot-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-isiot-u-boot.dtsi @@ -5,6 +5,22 @@ #include "imx6ul-u-boot.dtsi" +&soc { + u-boot,dm-pre-reloc; +}; + +&aips1 { + u-boot,dm-pre-reloc; +}; + +&pinctrl_uart1 { + u-boot,dm-pre-reloc; +}; + +&uart1 { + u-boot,dm-pre-reloc; +}; + &usdhc1 { u-boot,dm-spl; }; diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c index 6a0612481a..f1ccdc3343 100644 --- a/board/engicam/common/spl.c +++ b/board/engicam/common/spl.c @@ -26,20 +26,6 @@ #include #include -#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ - PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -static iomux_v3_cfg_t const uart_pads[] = { -#ifdef CONFIG_MX6QDL - IOMUX_PADS(PAD_KEY_COL0__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)), - IOMUX_PADS(PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)), -#elif CONFIG_MX6UL - IOMUX_PADS(PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL)), - IOMUX_PADS(PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL)), -#endif -}; - #ifdef CONFIG_SPL_LOAD_FIT int board_fit_config_name_match(const char *name) { @@ -421,12 +407,12 @@ void board_init_f(ulong dummy) if (!(is_mx6ul())) gpr_init(); - /* iomux */ - SETUP_IOMUX_PADS(uart_pads); - /* setup GP timer */ timer_init(); + /* Enable device tree and early DM support*/ + spl_early_init(); + /* UART clocks enabled and gd valid - init serial console */ preloader_console_init(); diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig index fe4866e2f5..af5873a784 100644 --- a/configs/imx6dl_icore_nand_defconfig +++ b/configs/imx6dl_icore_nand_defconfig @@ -66,6 +66,7 @@ CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_VIDEO=y diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig index 2cb995e7ae..8535627049 100644 --- a/configs/imx6q_icore_nand_defconfig +++ b/configs/imx6q_icore_nand_defconfig @@ -67,6 +67,7 @@ CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_VIDEO=y diff --git a/configs/imx6qdl_icore_mipi_defconfig b/configs/imx6qdl_icore_mipi_defconfig index 90eb153c45..8dd5e89511 100644 --- a/configs/imx6qdl_icore_mipi_defconfig +++ b/configs/imx6qdl_icore_mipi_defconfig @@ -74,5 +74,6 @@ CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 9f6d29a268..46497fbde1 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -90,6 +90,7 @@ CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_VIDEO=y diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig index 2cb995e7ae..8535627049 100644 --- a/configs/imx6qdl_icore_nand_defconfig +++ b/configs/imx6qdl_icore_nand_defconfig @@ -67,6 +67,7 @@ CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_VIDEO=y diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig index ee2c597bcb..3bab6739d0 100644 --- a/configs/imx6qdl_icore_rqs_defconfig +++ b/configs/imx6qdl_icore_rqs_defconfig @@ -72,4 +72,5 @@ CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y