summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx51/clock.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-mx51/clock.c')
-rw-r--r--arch/arm/mach-mx51/clock.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-mx51/clock.c b/arch/arm/mach-mx51/clock.c
index 3600b649cdba..5b053fc268e6 100644
--- a/arch/arm/mach-mx51/clock.c
+++ b/arch/arm/mach-mx51/clock.c
@@ -358,6 +358,18 @@ static int _clk_pll_set_rate(struct clk *clk, unsigned long rate)
__raw_writel(mfn, pllbase + MXC_PLL_DP_HFS_MFN);
}
+ /* If auto restart is disabled, restart the PLL and
+ * wait for it to lock.
+ */
+ reg = __raw_readl(pllbase + MXC_PLL_DP_CONFIG);
+ if (!reg & MXC_PLL_DP_CONFIG_AREN) {
+ reg = __raw_readl(pllbase + MXC_PLL_DP_CTL);
+ reg |= MXC_PLL_DP_CTL_RST;
+ __raw_writel(reg, pllbase + MXC_PLL_DP_CTL);
+ }
+ while (!(__raw_readl(pllbase + MXC_PLL_DP_CTL) & MXC_PLL_DP_CTL_LRF))
+ ;
+
clk->rate = rate;
return 0;
}