summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/mx6/soc.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/cpu/armv7/mx6/soc.c')
-rw-r--r--arch/arm/cpu/armv7/mx6/soc.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index b648704..7192d67 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -367,6 +367,16 @@ void vadc_power_down(void)
}
#endif
+static void set_uart_from_osc(void)
+{
+ u32 reg;
+
+ /* set uart clk to OSC */
+ reg = readl(CCM_BASE_ADDR + 0x24);
+ reg |= MXC_CCM_CSCDR1_UART_CLK_SEL;
+ writel(reg, CCM_BASE_ADDR + 0x24);
+}
+
int arch_cpu_init(void)
{
init_aips();
@@ -403,6 +413,9 @@ int arch_cpu_init(void)
set_preclk_from_osc();
#endif
+ if (is_cpu_type(MXC_CPU_MX6SX))
+ set_uart_from_osc();
+
imx_set_wdog_powerdown(false); /* Disable PDE bit of WMCR register */
#ifdef CONFIG_APBH_DMA