Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / arm / mach-omap2 / clockdomain.c

diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c
index 2da3b5e..b79b1ca 100644 (file)
--- a/arch/arm/mach-omap2/clockdomain.c
+++ b/arch/arm/mach-omap2/clockdomain.c
@@ -465,10 +465,7 @@ int clkdm_complete_init(void)
                return -EACCES;
 
        list_for_each_entry(clkdm, &clkdm_list, node) {
-               if (clkdm->flags & CLKDM_CAN_FORCE_WAKEUP)
-                       clkdm_wakeup(clkdm);
-               else if (clkdm->flags & CLKDM_CAN_DISABLE_AUTO)
-                       clkdm_deny_idle(clkdm);
+               clkdm_deny_idle(clkdm);
 
                _resolve_clkdm_deps(clkdm, clkdm->wkdep_srcs);
                clkdm_clear_all_wkdeps(clkdm);
@@ -925,11 +922,20 @@ void clkdm_allow_idle_nolock(struct clockdomain *clkdm)
        if (!clkdm)
                return;
 
-       if (!(clkdm->flags & CLKDM_CAN_ENABLE_AUTO)) {
-               pr_debug("clock: %s: automatic idle transitions cannot be enabled\n",
-                        clkdm->name);
+       if (!WARN_ON(!clkdm->forcewake_count))
+               clkdm->forcewake_count--;
+
+       if (clkdm->forcewake_count)
+               return;
+
+       if (!clkdm->usecount && (clkdm->flags & CLKDM_CAN_FORCE_SLEEP))
+               clkdm_sleep_nolock(clkdm);
+
+       if (!(clkdm->flags & CLKDM_CAN_ENABLE_AUTO))
+               return;
+
+       if (clkdm->flags & CLKDM_MISSING_IDLE_REPORTING)
                return;
-       }
 
        if (!arch_clkdm || !arch_clkdm->clkdm_allow_idle)
                return;
@@ -974,11 +980,17 @@ void clkdm_deny_idle_nolock(struct clockdomain *clkdm)
        if (!clkdm)
                return;
 
-       if (!(clkdm->flags & CLKDM_CAN_DISABLE_AUTO)) {
-               pr_debug("clockdomain: %s: automatic idle transitions cannot be disabled\n",
-                        clkdm->name);
+       if (clkdm->forcewake_count++)
+               return;
+
+       if (clkdm->flags & CLKDM_CAN_FORCE_WAKEUP)
+               clkdm_wakeup_nolock(clkdm);
+
+       if (!(clkdm->flags & CLKDM_CAN_DISABLE_AUTO))
+               return;
+
+       if (clkdm->flags & CLKDM_MISSING_IDLE_REPORTING)
                return;
-       }
 
        if (!arch_clkdm || !arch_clkdm->clkdm_deny_idle)
                return;