diff options
-rw-r--r-- | arch/arm/mach-omap2/dpll3xxx.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c index 3aed4b0b9563..ae84c9d40118 100644 --- a/arch/arm/mach-omap2/dpll3xxx.c +++ b/arch/arm/mach-omap2/dpll3xxx.c | |||
@@ -307,10 +307,10 @@ static int omap3_noncore_dpll_program(struct clk_hw_omap *clk, u16 freqsel) | |||
307 | _omap3_noncore_dpll_bypass(clk); | 307 | _omap3_noncore_dpll_bypass(clk); |
308 | 308 | ||
309 | /* | 309 | /* |
310 | * Set jitter correction. No jitter correction for OMAP4 and 3630 | 310 | * Set jitter correction. Jitter correction applicable for OMAP343X |
311 | * since freqsel field is no longer present | 311 | * only since freqsel field is no longer present on other devices. |
312 | */ | 312 | */ |
313 | if (!soc_is_am33xx() && !cpu_is_omap44xx() && !cpu_is_omap3630()) { | 313 | if (cpu_is_omap343x()) { |
314 | v = __raw_readl(dd->control_reg); | 314 | v = __raw_readl(dd->control_reg); |
315 | v &= ~dd->freqsel_mask; | 315 | v &= ~dd->freqsel_mask; |
316 | v |= freqsel << __ffs(dd->freqsel_mask); | 316 | v |= freqsel << __ffs(dd->freqsel_mask); |
@@ -500,9 +500,8 @@ int omap3_noncore_dpll_set_rate(struct clk_hw *hw, unsigned long rate, | |||
500 | if (dd->last_rounded_rate == 0) | 500 | if (dd->last_rounded_rate == 0) |
501 | return -EINVAL; | 501 | return -EINVAL; |
502 | 502 | ||
503 | /* No freqsel on AM335x, OMAP4 and OMAP3630 */ | 503 | /* Freqsel is available only on OMAP343X devices */ |
504 | if (!soc_is_am33xx() && !cpu_is_omap44xx() && | 504 | if (cpu_is_omap343x()) { |
505 | !cpu_is_omap3630()) { | ||
506 | freqsel = _omap3_dpll_compute_freqsel(clk, | 505 | freqsel = _omap3_dpll_compute_freqsel(clk, |
507 | dd->last_rounded_n); | 506 | dd->last_rounded_n); |
508 | WARN_ON(!freqsel); | 507 | WARN_ON(!freqsel); |