From: Ye.Li <B37916@freescale.com>
Date: Thu, 30 Oct 2014 10:20:57 +0000 (+0800)
Subject: imx: mx6: Change the get_ipg_per_clk for OSC 24Mhz source
X-Git-Tag: v2015.01-rc1~35^2~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e68661a32eb1304413ce45900446bcce9204537e;p=oweals%2Fu-boot.git

imx: mx6: Change the get_ipg_per_clk for OSC 24Mhz source

For MX6SL and MX6SX, the perclk can come from OSC 24Mhz source. Fix
the get_ipg_per_clk function to support it.

Signed-off-by: Ye.Li <B37916@freescale.com>
---

diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
index d200531030..6c9c78c11a 100644
--- a/arch/arm/cpu/armv7/mx6/clock.c
+++ b/arch/arm/cpu/armv7/mx6/clock.c
@@ -312,6 +312,10 @@ static u32 get_ipg_per_clk(void)
 	u32 reg, perclk_podf;
 
 	reg = __raw_readl(&imx_ccm->cscmr1);
+#if (defined(CONFIG_MX6SL) || defined(CONFIG_MX6SX))
+	if (reg & MXC_CCM_CSCMR1_PER_CLK_SEL_MASK)
+		return MXC_HCLK; /* OSC 24Mhz */
+#endif
 	perclk_podf = reg & MXC_CCM_CSCMR1_PERCLK_PODF_MASK;
 
 	return get_ipg_clk() / (perclk_podf + 1);