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/clkt_dpll.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/clkt_dpll.c')
-rw-r--r-- | arch/arm/mach-omap2/clkt_dpll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clkt_dpll.c b/arch/arm/mach-omap2/clkt_dpll.c index cd7fd0f91149..05ff99e528c8 100644 --- a/arch/arm/mach-omap2/clkt_dpll.c +++ b/arch/arm/mach-omap2/clkt_dpll.c | |||
@@ -211,7 +211,7 @@ void omap2_init_dpll_parent(struct clk *clk) | |||
211 | if (v == OMAP3XXX_EN_DPLL_LPBYPASS || | 211 | if (v == OMAP3XXX_EN_DPLL_LPBYPASS || |
212 | v == OMAP3XXX_EN_DPLL_FRBYPASS) | 212 | v == OMAP3XXX_EN_DPLL_FRBYPASS) |
213 | clk_reparent(clk, dd->clk_bypass); | 213 | clk_reparent(clk, dd->clk_bypass); |
214 | } else if (cpu_is_omap44xx()) { | 214 | } else if (soc_is_am33xx() || cpu_is_omap44xx()) { |
215 | if (v == OMAP4XXX_EN_DPLL_LPBYPASS || | 215 | if (v == OMAP4XXX_EN_DPLL_LPBYPASS || |
216 | v == OMAP4XXX_EN_DPLL_FRBYPASS || | 216 | v == OMAP4XXX_EN_DPLL_FRBYPASS || |
217 | v == OMAP4XXX_EN_DPLL_MNBYPASS) | 217 | v == OMAP4XXX_EN_DPLL_MNBYPASS) |
@@ -257,7 +257,7 @@ u32 omap2_get_dpll_rate(struct clk *clk) | |||
257 | if (v == OMAP3XXX_EN_DPLL_LPBYPASS || | 257 | if (v == OMAP3XXX_EN_DPLL_LPBYPASS || |
258 | v == OMAP3XXX_EN_DPLL_FRBYPASS) | 258 | v == OMAP3XXX_EN_DPLL_FRBYPASS) |
259 | return dd->clk_bypass->rate; | 259 | return dd->clk_bypass->rate; |
260 | } else if (cpu_is_omap44xx()) { | 260 | } else if (soc_is_am33xx() || cpu_is_omap44xx()) { |
261 | if (v == OMAP4XXX_EN_DPLL_LPBYPASS || | 261 | if (v == OMAP4XXX_EN_DPLL_LPBYPASS || |
262 | v == OMAP4XXX_EN_DPLL_FRBYPASS || | 262 | v == OMAP4XXX_EN_DPLL_FRBYPASS || |
263 | v == OMAP4XXX_EN_DPLL_MNBYPASS) | 263 | v == OMAP4XXX_EN_DPLL_MNBYPASS) |