diff options
author | Vaibhav Hiremath <hvaibhav@ti.com> | 2012-08-24 10:54:24 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-09-12 18:28:34 -0400 |
commit | 78da264019e18db25b937fbb98328c680b1161cd (patch) | |
tree | 10703621325d2c60fb982b8a2e3ebdf4f4c8f47d /arch/arm/mach-omap2/dpll3xxx.c | |
parent | a2cfc509bc4eeef9f5c4607b1203f17f22ea2a36 (diff) |
ARM: OMAP2+: dpll: Add missing soc_is_am33xx() check for common functions
Add missing soc_is_am33xx() check for DPLL common control & clock
related functions, without this dpll programmability would be broken
for am33xx family of devices.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/dpll3xxx.c')
-rw-r--r-- | arch/arm/mach-omap2/dpll3xxx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c index b9c8d2f6a81f..063e1f9b465a 100644 --- a/arch/arm/mach-omap2/dpll3xxx.c +++ b/arch/arm/mach-omap2/dpll3xxx.c | |||
@@ -311,7 +311,7 @@ static int omap3_noncore_dpll_program(struct clk *clk, u16 m, u8 n, u16 freqsel) | |||
311 | * Set jitter correction. No jitter correction for OMAP4 and 3630 | 311 | * Set jitter correction. No jitter correction for OMAP4 and 3630 |
312 | * since freqsel field is no longer present | 312 | * since freqsel field is no longer present |
313 | */ | 313 | */ |
314 | if (!cpu_is_omap44xx() && !cpu_is_omap3630()) { | 314 | if (!soc_is_am33xx() && !cpu_is_omap44xx() && !cpu_is_omap3630()) { |
315 | v = __raw_readl(dd->control_reg); | 315 | v = __raw_readl(dd->control_reg); |
316 | v &= ~dd->freqsel_mask; | 316 | v &= ~dd->freqsel_mask; |
317 | v |= freqsel << __ffs(dd->freqsel_mask); | 317 | v |= freqsel << __ffs(dd->freqsel_mask); |
@@ -471,7 +471,7 @@ int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate) | |||
471 | return -EINVAL; | 471 | return -EINVAL; |
472 | 472 | ||
473 | /* No freqsel on OMAP4 and OMAP3630 */ | 473 | /* No freqsel on OMAP4 and OMAP3630 */ |
474 | if (!cpu_is_omap44xx() && !cpu_is_omap3630()) { | 474 | if (!soc_is_am33xx() && !cpu_is_omap44xx() && !cpu_is_omap3630()) { |
475 | freqsel = _omap3_dpll_compute_freqsel(clk, | 475 | freqsel = _omap3_dpll_compute_freqsel(clk, |
476 | dd->last_rounded_n); | 476 | dd->last_rounded_n); |
477 | if (!freqsel) | 477 | if (!freqsel) |