OMAP3 clock: Remove FreqSel for 3630
authorVishwanath BS <vishwanath.bs@ti.com>
Wed, 24 Feb 2010 19:05:57 +0000 (12:05 -0700)
committerPaul Walmsley <paul@pwsan.com>
Wed, 24 Feb 2010 19:05:57 +0000 (12:05 -0700)
DPLL_FREQSEL field in CLKEN_PLL register is no longer valid for
OMAP3630. So remove references to that.

Signed-off-by: Vishwanath BS <vishwanath.bs@ti.com>
Cc: Sergei Shtylyov <sshtylyov@mvista.com>
[paul@pwsan.com: added comment fix from Sergei Shtylyov]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
arch/arm/mach-omap2/dpll3xxx.c

index 2b559fc64855bab92f05217c62845270d95b5591..68268cd89e05eb66ee792d033afc32ed0cc9c52d 100644 (file)
@@ -243,8 +243,11 @@ 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 */
-       if (!cpu_is_omap44xx()) {
+       /*
+        * Set jitter correction. No jitter correction for OMAP4 and 3630
+        * since freqsel field is no longer present
+        */
+       if (!cpu_is_omap44xx() && !cpu_is_omap3630()) {
                v = __raw_readl(dd->control_reg);
                v &= ~dd->freqsel_mask;
                v |= freqsel << __ffs(dd->freqsel_mask);
@@ -387,8 +390,8 @@ int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate)
                if (dd->last_rounded_rate == 0)
                        return -EINVAL;
 
-               /* No freqsel on OMAP4 */
-               if (!cpu_is_omap44xx()) {
+               /* No freqsel on OMAP4 and OMAP3630 */
+               if (!cpu_is_omap44xx() && !cpu_is_omap3630()) {
                        freqsel = _omap3_dpll_compute_freqsel(clk,
                                                dd->last_rounded_n);
                        if (!freqsel)