summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerry Lv <r65388@freescale.com>2012-10-30 09:46:53 +0800
committerTerry Lv <r65388@freescale.com>2012-10-30 09:52:48 +0800
commit6be77a3831084293070bd95e57164a8b0d3ddd09 (patch)
tree4b5047580afdb1cf9da76fe06decd3cc42febce8
parentce91cea872f6b8d079d3a54f0d1e0647be07f91b (diff)
downloadu-boot-imx-6be77a3831084293070bd95e57164a8b0d3ddd09.zip
u-boot-imx-6be77a3831084293070bd95e57164a8b0d3ddd09.tar.gz
u-boot-imx-6be77a3831084293070bd95e57164a8b0d3ddd09.tar.bz2
ENGR00231553: MX6SL: Uncovered an issue for I2C parent clock
We need to check reg bit to decide I2C parent clock. Signed-off-by: Terry Lv <r65388@freescale.com>
-rw-r--r--cpu/arm_cortexa8/mx6/generic.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/cpu/arm_cortexa8/mx6/generic.c b/cpu/arm_cortexa8/mx6/generic.c
index 6a98d04..9508284 100644
--- a/cpu/arm_cortexa8/mx6/generic.c
+++ b/cpu/arm_cortexa8/mx6/generic.c
@@ -209,10 +209,15 @@ static u32 __get_ipg_clk(void)
static u32 __get_ipg_per_clk(void)
{
- u32 podf;
+ u32 podf, reg;
u32 clk_root = __get_ipg_clk();
- podf = __REG(MXC_CCM_CSCMR1) & MXC_CCM_CSCMR1_PERCLK_PODF_MASK;
+ reg = __REG(MXC_CCM_CSCMR1);
+#ifdef CONFIG_MX6SL
+ if (reg & 0x40) /* PERCLK from 24M OSC */
+ clk_root = CONFIG_MX6_HCLK_FREQ;
+#endif
+ podf = reg & MXC_CCM_CSCMR1_PERCLK_PODF_MASK;
return clk_root / (podf + 1);
}