diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-01 18:30:47 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-01 18:30:47 +0200 |
| commit | 105612489bf59386b46b3f9f034e03f70e57aee6 (patch) | |
| tree | d6a5d2ba3702a69649ea59c6cb31caadb9941459 /arch/arm/mach-omap2/dpll3xxx.c | |
| parent | Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | ARM: OMAP5: clock: No Freqsel on OMAP5 devices too (diff) | |
| download | linux-105612489bf59386b46b3f9f034e03f70e57aee6.tar.xz linux-105612489bf59386b46b3f9f034e03f70e57aee6.zip | |
Merge branch 'for_3.10/omap5_generic_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/fixes-non-critical
Diffstat (limited to 'arch/arm/mach-omap2/dpll3xxx.c')
| -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 6e9873ff1844..3a0296cfcace 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) _omap3_noncore_dpll_bypass(clk); /* - * Set jitter correction. No jitter correction for OMAP4 and 3630 - * since freqsel field is no longer present + * Set jitter correction. Jitter correction applicable for OMAP343X + * only since freqsel field is no longer present on other devices. */ - if (!soc_is_am33xx() && !cpu_is_omap44xx() && !cpu_is_omap3630()) { + if (cpu_is_omap343x()) { v = __raw_readl(dd->control_reg); v &= ~dd->freqsel_mask; v |= freqsel << __ffs(dd->freqsel_mask); @@ -502,9 +502,8 @@ int omap3_noncore_dpll_set_rate(struct clk_hw *hw, unsigned long rate, if (dd->last_rounded_rate == 0) return -EINVAL; - /* No freqsel on AM335x, OMAP4 and OMAP3630 */ - if (!soc_is_am33xx() && !cpu_is_omap44xx() && - !cpu_is_omap3630()) { + /* Freqsel is available only on OMAP343X devices */ + if (cpu_is_omap343x()) { freqsel = _omap3_dpll_compute_freqsel(clk, dd->last_rounded_n); WARN_ON(!freqsel); |