mx6cuboxi: migrate to DM_SERIAL

Add the needed DT overrides to enable UART in SPL.

Cc: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Tested-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Fabio Estevam <festevam@denx.de>

diff --git a/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi b/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi
index 400b885e4370626b4debf96f04727598cbdd01db..e1cb9b3e89eccf12061122324b03a713bd5f262a 100644 (file)
--- a/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi
@@ -15,6 +15,22 @@
        };
 };
 
+&soc {
+       u-boot,dm-pre-reloc;
+};
+
+&aips1 {
+       u-boot,dm-pre-reloc;
+};
+
+&pinctrl_microsom_uart1 {
+       u-boot,dm-pre-reloc;
+};
+
+&uart1 {
+       u-boot,dm-pre-reloc;
+};
+
 &gpio2 {
        u-boot,dm-pre-reloc;
 };

diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index debf4f6a3b06a7444b68a39c6f59cbde8a8b56ef..8e80ca6e17e00b826d3eb3ce3ed6417fe1618c03 100644 (file)
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -844,6 +844,9 @@ void board_init_f(ulong dummy)
        /* 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/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index 46061f597255347065e2f152d1298aafc73570cd..45bc0a622f52446462b4ca9c0349618acf648eb0 100644 (file)
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -47,7 +47,6 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_LIST="imx6dl-hummingboard2-emmc-som-v15 imx6q-hummingboard2-emmc-som-v15"
 CONFIG_MULTI_DTB_FIT=y
-CONFIG_SPL_OF_PLATDATA=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
@@ -69,6 +68,7 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_DM_THERMAL=y
 CONFIG_IMX_THERMAL=y