diff options
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 a3b60c7b9aa8..83b658bf385a 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) |