[ARM] OMAP3 clock: fix DPLL jitter correction and rate programming

Fix DPLL jitter correction programming.  Previously,
omap3_noncore_dpll_program() stored the FREQSEL jitter correction
parameter to the wrong register.  This caused jitter correction to be set
incorrectly and also caused the DPLL divider to be programmed incorrectly.

Also, fix DPLL divider programming.  An off-by-one error existed in
omap3_noncore_dpll_program(), causing DPLLs to be programmed with a higher
divider than intended.

linux-omap source commit is 5c0ec88a2145cdf2f2c9cc5fae49635c4c2476c7.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 8 insertions, 5 deletions

diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index cb5e068feb56..fdfc7d582913 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -563,14 +563,17 @@ static int omap3_noncore_dpll_program(struct clk *clk, u16 m, u8 n, u16 freqsel)
         /* 3430 ES2 TRM: 4.7.6.9 DPLL Programming Sequence */
         _omap3_noncore_dpll_bypass(clk);
 
+        /* Set jitter correction */
+        v = __raw_readl(dd->control_reg);
+        v &= ~dd->freqsel_mask;
+        v |= freqsel << __ffs(dd->freqsel_mask);
+        __raw_writel(v, dd->control_reg);
+
+        /* Set DPLL multiplier, divider */
         v = __raw_readl(dd->mult_div1_reg);
         v &= ~(dd->mult_mask | dd->div1_mask);
-
-        /* Set mult (M), div1 (N), freqsel */
         v |= m << __ffs(dd->mult_mask);
-        v |= n << __ffs(dd->div1_mask);
-        v |= freqsel << __ffs(dd->freqsel_mask);
-
+        v |= (n - 1) << __ffs(dd->div1_mask);
         __raw_writel(v, dd->mult_div1_reg);
 
         /* We let the clock framework set the other output dividers later */