[PATCH] ARM: dts: imx8mm: Swap i.MX8M Mini Menlo board UARTs back

[Marek Vasut]

The first production revision of the MX8M Mini Menlo board implements
a hardware change which swaps console UART and another UART connector.
Implement the swap, which maps the console UART back to the way Verdin
console is mapped.

Signed-off-by: Marek Vasut <marex at denx.de>
---
Cc: Fabio Estevam <festevam at denx.de>
Cc: Marcel Ziswiler <marcel.ziswiler at toradex.com>
Cc: Max Krummenacher <max.krummenacher at toradex.com>
Cc: Peng Fan <peng.fan at nxp.com>
Cc: Stefano Babic <sbabic at denx.de>
---
 arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi | 18 +-----------------
 board/menlo/mx8menlo/mx8menlo.c          |  2 +-
 include/configs/imx8mm-mx8menlo.h        |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi b/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi
index 66cc97842c0..484d493e33c 100644
--- a/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi
@@ -6,7 +6,7 @@
 
 / {
 	chosen {
-		stdout-path = &uart2;
+		stdout-path = &uart1;
 	};
 
 	aliases {
@@ -20,19 +20,3 @@
 &i2c4 {
 	/delete-node/ codec at 1a;
 };
-
-&pinctrl_uart1 {
-	/delete-property/ u-boot,dm-spl;
-};
-
-&pinctrl_uart2 {
-	u-boot,dm-spl;
-};
-
-&uart1 {
-	/delete-property/ u-boot,dm-spl;
-};
-
-&uart2 {
-	u-boot,dm-spl;
-};
diff --git a/board/menlo/mx8menlo/mx8menlo.c b/board/menlo/mx8menlo/mx8menlo.c
index 61fc4ec85f0..18f5fd5c5ee 100644
--- a/board/menlo/mx8menlo/mx8menlo.c
+++ b/board/menlo/mx8menlo/mx8menlo.c
@@ -14,5 +14,5 @@
 
 void board_early_init(void)
 {
-	init_uart_clk(1);
+	init_uart_clk(0);
 }
diff --git a/include/configs/imx8mm-mx8menlo.h b/include/configs/imx8mm-mx8menlo.h
index 530ecd1d460..938c5406b82 100644
--- a/include/configs/imx8mm-mx8menlo.h
+++ b/include/configs/imx8mm-mx8menlo.h
@@ -25,7 +25,7 @@
 		"fi ; "							\
 		"boot\0"						\
 	"boot_file=fitImage\0"						\
-	"console=ttymxc1\0"						\
+	"console=ttymxc0\0"						\
 	"fdt_addr=0x43000000\0"						\
 	"initrd_addr=0x43800000\0"					\
 	"kernel_image=fitImage\0"
-- 
2.35.1