summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAnson Huang <b20788@freescale.com>2014-09-09 14:43:51 +0800
committerPeng Fan <Peng.Fan@freescale.com>2015-04-29 14:43:08 +0800
commitb5e1b393192099e91c5cb75b69291c87eacb9f60 (patch)
tree5f441e62109b0353634b037e4f792cd5acafb19e /arch
parent701733cf4c70d152af5b22159a44069427f54752 (diff)
downloadu-boot-imx-b5e1b393192099e91c5cb75b69291c87eacb9f60.zip
u-boot-imx-b5e1b393192099e91c5cb75b69291c87eacb9f60.tar.gz
u-boot-imx-b5e1b393192099e91c5cb75b69291c87eacb9f60.tar.bz2
ENGR00331269 arm: mx6: select OSC as uart's clk parent
As M4 is sourcing UART clk from OSC, to make UART work when M4 is enabled, need to select OSC as clk parent, 24M OSC is enough for debug UART in uboot. Signed-off-by: Anson Huang <b20788@freescale.com> (cherry picked from commit 8b903f529370fdc59cc03b3ced954ed894753044) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/mx6/soc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 1e72212..e584306 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -435,6 +435,15 @@ int arch_cpu_init(void)
set_preclk_from_osc();
#endif
+#ifdef CONFIG_MX6SX
+ u32 reg;
+
+ /* set uart clk to OSC */
+ reg = readl(CCM_BASE_ADDR + 0x24);
+ reg |= 0x40;
+ writel(reg, CCM_BASE_ADDR + 0x24);
+#endif
+
imx_set_wdog_powerdown(false); /* Disable PDE bit of WMCR register */
#ifndef CONFIG_MX6SL