engicam: imx6: migrate to DM_SERIAL
Subsystems (2)
PATCH 1/1 engicam: imx6: migrate to DM_SERIAL
From: Michael Trimarchi <[email protected]>
Add the needed DT overrides and configs to enable UART in SPL.
Cc Fabio Estevam <[email protected]>
Signed-off-by Michael Trimarchi <[email protected]>
Tested-by Suniel Mahesh <[email protected]>
---
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(-)
arch/arm/dts/imx6qdl-icore-u-boot.dtsi +16 -0
@@ -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; };
arch/arm/dts/imx6ul-isiot-u-boot.dtsi +16 -0
@@ -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; };
board/engicam/common/spl.c +3 -17
@@ -26,20 +26,6 @@#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/video.h> -#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 ();
configs/imx6dl_icore_nand_defconfig +1 -0
@@ -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
configs/imx6q_icore_nand_defconfig +1 -0
@@ -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
configs/imx6qdl_icore_mipi_defconfig +1 -0
@@ -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
configs/imx6qdl_icore_mmc_defconfig +1 -0
@@ -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
configs/imx6qdl_icore_nand_defconfig +1 -0
@@ -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
configs/imx6qdl_icore_rqs_defconfig +1 -0
@@ -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
Signature · 1 line
2.25.1
Please review and comment on this changeset.
Regards
Suniel
Hi Suniel,
Quoted 8 lines · Suniel Mahesh
From: Michael Trimarchi <[email protected]>
Add the needed DT overrides and configs to enable UART in SPL.
Cc Fabio Estevam <[email protected]>Signed-off-by Michael Trimarchi <[email protected]>Tested-by Suniel Mahesh <[email protected]>
You missed your Signed-off-by here.
With that added:
Reviewed-by Fabio Estevam <[email protected]>
PATCH 1/1 engicam: imx6: migrate to DM_SERIAL
In reply to Suniel MaheshQuoted 6 lines
From: Michael Trimarchi <[email protected]> Add the needed DT overrides and configs to enable UART in SPL.
Cc Fabio Estevam <[email protected]>Signed-off-by Michael Trimarchi <[email protected]>Tested-by Suniel Mahesh <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================