Commit 2da97eda457ceb70d01065a8f7417a657557f8c0
1 parent
9cbb3c2db5
Exists in
smarc-imx_v2018.03_4.14.78_1.0.0_ga
Fix console port switching problem
Showing 3 changed files with 16 additions and 7 deletions Side-by-side Diff
arch/arm/dts/fsl-smarcimx8mq.dts
... | ... | @@ -24,11 +24,6 @@ |
24 | 24 | model = "Embedian SMARC-iMX8M Computer on Module"; |
25 | 25 | compatible = "embedian,imx8mq-smarcimx8m", "fsl,imx8mq"; |
26 | 26 | |
27 | - chosen { | |
28 | - bootargs = "console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200"; | |
29 | - stdout-path = &uart1; | |
30 | - }; | |
31 | - | |
32 | 27 | regulators { |
33 | 28 | compatible = "simple-bus"; |
34 | 29 | #address-cells = <1>; |
board/embedian/smarcimx8mq/smarcimx8mq.c
... | ... | @@ -93,8 +93,8 @@ |
93 | 93 | #ifdef CONFIG_CONSOLE_SER0 |
94 | 94 | static iomux_v3_cfg_t const uart4_pads[] = { |
95 | 95 | IMX8MQ_PAD_UART4_RXD__UART4_RX | MUX_PAD_CTRL(UART_PAD_CTRL), |
96 | - MX8MQ_IOMUXC_ECSPI2_SS0_UART4_DCE_RTS_B | MUX_PAD_CTRL(UART_PAD_CTRL), | |
97 | - MX8MQ_IOMUXC_ECSPI2_MISO_UART4_DCE_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL), | |
96 | + IMX8MQ_PAD_ECSPI2_SS0__UART4_RTS_B | MUX_PAD_CTRL(UART_PAD_CTRL), | |
97 | + IMX8MQ_PAD_ECSPI2_MISO__UART4_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL), | |
98 | 98 | IMX8MQ_PAD_UART4_TXD__UART4_TX | MUX_PAD_CTRL(UART_PAD_CTRL), |
99 | 99 | }; |
100 | 100 | #endif |
board/embedian/smarcimx8mq/spl.c
... | ... | @@ -236,7 +236,21 @@ |
236 | 236 | |
237 | 237 | arch_cpu_init(); |
238 | 238 | |
239 | +#ifdef CONFIG_CONSOLE_SER3 | |
239 | 240 | init_uart_clk(0); /* Init UART0 clock */ |
241 | +#endif | |
242 | + | |
243 | +#ifdef CONFIG_CONSOLE_SER2 | |
244 | + init_uart_clk(1); /* Init UART1 clock */ | |
245 | +#endif | |
246 | + | |
247 | +#ifdef CONFIG_CONSOLE_SER1 | |
248 | + init_uart_clk(2); /* Init UART2 clock */ | |
249 | +#endif | |
250 | + | |
251 | +#ifdef CONFIG_CONSOLE_SER0 | |
252 | + init_uart_clk(3); /* Init UART3 clock */ | |
253 | +#endif | |
240 | 254 | |
241 | 255 | board_early_init_f(); |
242 | 256 |