summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/clkt2xxx_dpll.c
diff options
context:
space:
mode:
authorRajendra Nayak <rnayak@ti.com>2012-04-27 15:25:59 +0400
committerPaul Walmsley <paul@pwsan.com>2012-11-13 06:18:51 +0400
commitd037e100d138fb522ed0ea3e3a915bd8e0e36f63 (patch)
tree32a0dc720f4026dcba521b5b579933db59064cb0 /arch/arm/mach-omap2/clkt2xxx_dpll.c
parent455db9c9b23224f939723e9ded22b7a9a78fb57a (diff)
downloadlinux-d037e100d138fb522ed0ea3e3a915bd8e0e36f63.tar.xz
ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts
Clean all #ifdef's added to OMAP2 clock code to make it COMMON clk ready, not that CONFIG_COMMON_CLK is enabled. Signed-off-by: Rajendra Nayak <rnayak@ti.com> [paul@pwsan.com: also drop CONFIG_COMMON_CLK tests around APLL recalc_rate functions] Signed-off-by: Mike Turquette <mturquette@ti.com> [paul@pwsan.com: remove some ifdefs in mach-omap2/io.c] Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/clkt2xxx_dpll.c')
-rw-r--r--arch/arm/mach-omap2/clkt2xxx_dpll.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-omap2/clkt2xxx_dpll.c b/arch/arm/mach-omap2/clkt2xxx_dpll.c
index d0fd77b67261..82572e277b97 100644
--- a/arch/arm/mach-omap2/clkt2xxx_dpll.c
+++ b/arch/arm/mach-omap2/clkt2xxx_dpll.c
@@ -29,11 +29,7 @@
* REVISIT: DPLL can optionally enter low-power bypass by writing 0x1
* instead. Add some mechanism to optionally enter this mode.
*/
-#ifdef CONFIG_COMMON_CLK
static void _allow_idle(struct clk_hw_omap *clk)
-#else
-static void _allow_idle(struct clk *clk)
-#endif
{
if (!clk || !clk->dpll_data)
return;
@@ -47,11 +43,7 @@ static void _allow_idle(struct clk *clk)
*
* Disable DPLL automatic idle control. No return value.
*/
-#ifdef CONFIG_COMMON_CLK
static void _deny_idle(struct clk_hw_omap *clk)
-#else
-static void _deny_idle(struct clk *clk)
-#endif
{
if (!clk || !clk->dpll_data)
return;
@@ -61,15 +53,7 @@ static void _deny_idle(struct clk *clk)
/* Public data */
-#ifdef CONFIG_COMMON_CLK
const struct clk_hw_omap_ops clkhwops_omap2xxx_dpll = {
.allow_idle = _allow_idle,
.deny_idle = _deny_idle,
};
-#else
-const struct clkops clkops_omap2xxx_dpll_ops = {
- .allow_idle = _allow_idle,
- .deny_idle = _deny_idle,
-};
-#endif
-