From 4bae89e54bfc8ecda93fac50d2112dc9d762b6fd Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 28 Dec 2017 15:51:39 +0100 Subject: imx8: support UART1 as console UART for Apalis iMX8 Make sure we return the clock of UART1 when building for Apalis iMX8. NXP LPUART1 is used as Apalis UART1, which is typically the main console on our Linux BSP. Signed-off-by: Stefan Agner (cherry picked from commit f62ce2a12e69b30c4ac6d533b6eef247916bf968) (cherry picked from commit 53afce50e18bfb12d4a1cdef9e8a8b9272893df3) (cherry picked from commit d248c3d4c39c24b6f66972f4076cf72b2a5ece1f) Conflicts: arch/arm/cpu/armv8/imx8/clock.c, file moved --- arch/arm/mach-imx/imx8/clock.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-imx/imx8/clock.c index f7947fb247..bec1fb71d0 100644 --- a/arch/arm/mach-imx/imx8/clock.c +++ b/arch/arm/mach-imx/imx8/clock.c @@ -51,8 +51,13 @@ unsigned int mxc_get_clock(enum mxc_clock clk) switch (clk) { case MXC_UART_CLK: +#ifdef CONFIG_TARGET_APALIS_IMX8 + err = sc_pm_get_clock_rate((sc_ipc_t)gd->arch.ipc_channel_handle, + SC_R_UART_1, 2, &clkrate); +#else err = sc_pm_get_clock_rate((sc_ipc_t)gd->arch.ipc_channel_handle, SC_R_UART_0, 2, &clkrate); +#endif if (err != SC_ERR_NONE) { printf("sc get UART clk failed! err=%d\n", err); return 0; -- cgit v1.2.3