diff options
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/clock.c | 18 | ||||
-rw-r--r-- | arch/arm/mach-omap2/dpll3xxx.c | 14 |
2 files changed, 14 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 5c4e66542169..ea3f565ba1a4 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
@@ -398,24 +398,6 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) | |||
398 | return omap2_clksel_set_parent(clk, new_parent); | 398 | return omap2_clksel_set_parent(clk, new_parent); |
399 | } | 399 | } |
400 | 400 | ||
401 | /* OMAP3/4 non-CORE DPLL clkops */ | ||
402 | |||
403 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) | ||
404 | |||
405 | const struct clkops clkops_omap3_noncore_dpll_ops = { | ||
406 | .enable = omap3_noncore_dpll_enable, | ||
407 | .disable = omap3_noncore_dpll_disable, | ||
408 | .allow_idle = omap3_dpll_allow_idle, | ||
409 | .deny_idle = omap3_dpll_deny_idle, | ||
410 | }; | ||
411 | |||
412 | const struct clkops clkops_omap3_core_dpll_ops = { | ||
413 | .allow_idle = omap3_dpll_allow_idle, | ||
414 | .deny_idle = omap3_dpll_deny_idle, | ||
415 | }; | ||
416 | |||
417 | #endif | ||
418 | |||
419 | /* | 401 | /* |
420 | * OMAP2+ clock reset and init functions | 402 | * OMAP2+ clock reset and init functions |
421 | */ | 403 | */ |
diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c index c310dc0d40b4..b9c8d2f6a81f 100644 --- a/arch/arm/mach-omap2/dpll3xxx.c +++ b/arch/arm/mach-omap2/dpll3xxx.c | |||
@@ -638,3 +638,17 @@ unsigned long omap3_clkoutx2_recalc(struct clk *clk) | |||
638 | rate = clk->parent->rate * 2; | 638 | rate = clk->parent->rate * 2; |
639 | return rate; | 639 | return rate; |
640 | } | 640 | } |
641 | |||
642 | /* OMAP3/4 non-CORE DPLL clkops */ | ||
643 | |||
644 | const struct clkops clkops_omap3_noncore_dpll_ops = { | ||
645 | .enable = omap3_noncore_dpll_enable, | ||
646 | .disable = omap3_noncore_dpll_disable, | ||
647 | .allow_idle = omap3_dpll_allow_idle, | ||
648 | .deny_idle = omap3_dpll_deny_idle, | ||
649 | }; | ||
650 | |||
651 | const struct clkops clkops_omap3_core_dpll_ops = { | ||
652 | .allow_idle = omap3_dpll_allow_idle, | ||
653 | .deny_idle = omap3_dpll_deny_idle, | ||
654 | }; | ||