imx: mx6sx: select OSC as uart's clk parent

[platform/kernel/u-boot.git] / arch / arm / mach-imx / mx6 / soc.c

diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index e87a215..48eaa84 100644 (file)
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -379,6 +379,8 @@ static void set_preclk_from_osc(void)
 
 int arch_cpu_init(void)
 {
+       struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
        init_aips();
 
        /* Need to clear MMDC_CHx_MASK to make warm reset work. */
@@ -448,6 +450,9 @@ int arch_cpu_init(void)
 
        imx_set_wdog_powerdown(false); /* Disable PDE bit of WMCR register */
 
+       if (is_mx6sx())
+               setbits_le32(&ccm->cscdr1, MXC_CCM_CSCDR1_UART_CLK_SEL);
+
        init_src();
 
        return 0;