ARM: OMAP2: clock: Convert to common clk

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / pm24xx.c

diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index 83815ddc47866daef00a93696a9796a949c906e1..87ae36c7e1553e7ce4f86db358a11ccd017fc98e 100644 (file)
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -25,7 +25,11 @@
 #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>
@@ -202,7 +206,11 @@ 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;