summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/pm24xx.c
diff options
context:
space:
mode:
authorRajendra Nayak <rnayak@ti.com>2012-04-27 16:55:59 +0530
committerPaul Walmsley <paul@pwsan.com>2012-11-12 19:18:51 -0700
commitd037e100d138fb522ed0ea3e3a915bd8e0e36f63 (patch)
tree32a0dc720f4026dcba521b5b579933db59064cb0 /arch/arm/mach-omap2/pm24xx.c
parent455db9c9b23224f939723e9ded22b7a9a78fb57a (diff)
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/pm24xx.c')
-rw-r--r--arch/arm/mach-omap2/pm24xx.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index 87ae36c7e155..3d35bd64487c 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -25,11 +25,7 @@
#include <linux/sysfs.h>
#include <linux/module.h>
#include <linux/delay.h>
-#ifdef CONFIG_COMMON_CLK
#include <linux/clk-provider.h>
-#else
-#include <linux/clk.h>
-#endif
#include <linux/irq.h>
#include <linux/time.h>
#include <linux/gpio.h>
@@ -206,11 +202,7 @@ static int omap2_can_sleep(void)
{
if (omap2_fclks_active())
return 0;
-#ifdef CONFIG_COMMON_CLK
if (__clk_is_enabled(osc_ck))
-#else
- if (osc_ck->usecount > 1)
-#endif
return 0;
if (omap_dma_running())
return 0;