From 85f84661b01acf4e7002b752a3a05c7bfadfc8b4 Mon Sep 17 00:00:00 2001
From: Eric Lee <eric.lee@embedian.com>
Date: Fri, 9 Aug 2019 18:18:42 +0800
Subject: [PATCH] Fix console port switching problem

---
 arch/arm/dts/fsl-smarcimx8mq.dts         |  5 -----
 board/embedian/smarcimx8mq/smarcimx8mq.c |  4 ++--
 board/embedian/smarcimx8mq/spl.c         | 16 +++++++++++++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/arch/arm/dts/fsl-smarcimx8mq.dts b/arch/arm/dts/fsl-smarcimx8mq.dts
index a8f27a2..1da6f27 100644
--- a/arch/arm/dts/fsl-smarcimx8mq.dts
+++ b/arch/arm/dts/fsl-smarcimx8mq.dts
@@ -24,11 +24,6 @@
 	model = "Embedian SMARC-iMX8M Computer on Module";
 	compatible = "embedian,imx8mq-smarcimx8m", "fsl,imx8mq";
 
-	chosen {
-		bootargs = "console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200";
-		stdout-path = &uart1;
-	};
-
 	regulators {
 		compatible = "simple-bus";
 		#address-cells = <1>;
diff --git a/board/embedian/smarcimx8mq/smarcimx8mq.c b/board/embedian/smarcimx8mq/smarcimx8mq.c
index a5b8f7a..5ea9aa1 100644
--- a/board/embedian/smarcimx8mq/smarcimx8mq.c
+++ b/board/embedian/smarcimx8mq/smarcimx8mq.c
@@ -93,8 +93,8 @@ static iomux_v3_cfg_t const uart3_pads[] = {
 #ifdef CONFIG_CONSOLE_SER0
 static iomux_v3_cfg_t const uart4_pads[] = {
         IMX8MQ_PAD_UART4_RXD__UART4_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
-        MX8MQ_IOMUXC_ECSPI2_SS0_UART4_DCE_RTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),
-        MX8MQ_IOMUXC_ECSPI2_MISO_UART4_DCE_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),
+       	IMX8MQ_PAD_ECSPI2_SS0__UART4_RTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),
+       	IMX8MQ_PAD_ECSPI2_MISO__UART4_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),
         IMX8MQ_PAD_UART4_TXD__UART4_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
 };
 #endif
diff --git a/board/embedian/smarcimx8mq/spl.c b/board/embedian/smarcimx8mq/spl.c
index 204b14e..1729be1 100644
--- a/board/embedian/smarcimx8mq/spl.c
+++ b/board/embedian/smarcimx8mq/spl.c
@@ -236,7 +236,21 @@ void board_init_f(ulong dummy)
 
 	arch_cpu_init();
 
-	init_uart_clk(0); /* Init UART0 clock */
+#ifdef CONFIG_CONSOLE_SER3
+ 	init_uart_clk(0); /* Init UART0 clock */
+#endif
+
+#ifdef CONFIG_CONSOLE_SER2
+        init_uart_clk(1); /* Init UART1 clock */
+#endif
+
+#ifdef CONFIG_CONSOLE_SER1
+        init_uart_clk(2); /* Init UART2 clock */
+#endif
+
+#ifdef CONFIG_CONSOLE_SER0
+        init_uart_clk(3); /* Init UART3 clock */
+#endif
 
 	board_early_init_f();
 
-- 
1.9.1