diff options
author | Vishwanath BS <vishwanath.bs@ti.com> | 2010-02-24 14:05:57 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-02-24 14:05:57 -0500 |
commit | 5eb75f557843132da08938609def2774ee467d95 (patch) | |
tree | b1d54dd71f6b6dc8ee548c0a44461de9d58690c2 /arch | |
parent | 0cc9314eaf82ecf9914ad2c845574ed5e63c0374 (diff) |
OMAP3 clock: Remove FreqSel for 3630
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/dpll3xxx.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c index 2b559fc64855..68268cd89e05 100644 --- a/arch/arm/mach-omap2/dpll3xxx.c +++ b/arch/arm/mach-omap2/dpll3xxx.c | |||
@@ -243,8 +243,11 @@ static int omap3_noncore_dpll_program(struct clk *clk, u16 m, u8 n, u16 freqsel) | |||
243 | /* 3430 ES2 TRM: 4.7.6.9 DPLL Programming Sequence */ | 243 | /* 3430 ES2 TRM: 4.7.6.9 DPLL Programming Sequence */ |
244 | _omap3_noncore_dpll_bypass(clk); | 244 | _omap3_noncore_dpll_bypass(clk); |
245 | 245 | ||
246 | /* Set jitter correction */ | 246 | /* |
247 | if (!cpu_is_omap44xx()) { | 247 | * Set jitter correction. No jitter correction for OMAP4 and 3630 |
248 | * since freqsel field is no longer present | ||
249 | */ | ||
250 | if (!cpu_is_omap44xx() && !cpu_is_omap3630()) { | ||
248 | v = __raw_readl(dd->control_reg); | 251 | v = __raw_readl(dd->control_reg); |
249 | v &= ~dd->freqsel_mask; | 252 | v &= ~dd->freqsel_mask; |
250 | v |= freqsel << __ffs(dd->freqsel_mask); | 253 | v |= freqsel << __ffs(dd->freqsel_mask); |
@@ -387,8 +390,8 @@ int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate) | |||
387 | if (dd->last_rounded_rate == 0) | 390 | if (dd->last_rounded_rate == 0) |
388 | return -EINVAL; | 391 | return -EINVAL; |
389 | 392 | ||
390 | /* No freqsel on OMAP4 */ | 393 | /* No freqsel on OMAP4 and OMAP3630 */ |
391 | if (!cpu_is_omap44xx()) { | 394 | if (!cpu_is_omap44xx() && !cpu_is_omap3630()) { |
392 | freqsel = _omap3_dpll_compute_freqsel(clk, | 395 | freqsel = _omap3_dpll_compute_freqsel(clk, |
393 | dd->last_rounded_n); | 396 | dd->last_rounded_n); |
394 | if (!freqsel) | 397 | if (!freqsel) |