1 files changed, 38 insertions, 8 deletions

diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c
index a38a615b422f..b87ad66f083e 100644
--- a/arch/arm/mach-omap2/clockdomain.c
+++ b/arch/arm/mach-omap2/clockdomain.c
@@ -1,8 +1,8 @@
 /*
  * OMAP2/3/4 clockdomain framework functions
  *
- * Copyright (C) 2008-2009 Texas Instruments, Inc.
- * Copyright (C) 2008-2009 Nokia Corporation
+ * Copyright (C) 2008-2010 Texas Instruments, Inc.
+ * Copyright (C) 2008-2010 Nokia Corporation
  *
  * Written by Paul Walmsley and Jouni Högander
  * Added OMAP4 specific support by Abhijit Pagare <abhijitpagare@ti.com>
@@ -173,6 +173,9 @@ static void _clkdm_add_autodeps(struct clockdomain *clkdm)
 {
         struct clkdm_autodep *autodep;
 
+        if (!autodeps)
+                return;
+
         for (autodep = autodeps; autodep->clkdm.ptr; autodep++) {
                 if (IS_ERR(autodep->clkdm.ptr))
                         continue;
@@ -201,6 +204,9 @@ static void _clkdm_del_autodeps(struct clockdomain *clkdm)
 {
         struct clkdm_autodep *autodep;
 
+        if (!autodeps)
+                return;
+
         for (autodep = autodeps; autodep->clkdm.ptr; autodep++) {
                 if (IS_ERR(autodep->clkdm.ptr))
                         continue;
@@ -891,8 +897,17 @@ void omap2_clkdm_allow_idle(struct clockdomain *clkdm)
         pr_debug("clockdomain: enabling automatic idle transitions for %s\n",
                  clkdm->name);
 
-        if (atomic_read(&clkdm->usecount) > 0)
-                _clkdm_add_autodeps(clkdm);
+        /*
+         * XXX This should be removed once TI adds wakeup/sleep
+         * dependency code and data for OMAP4.
+         */
+        if (cpu_is_omap44xx()) {
+                WARN_ONCE(1, "clockdomain: OMAP4 wakeup/sleep dependency "
+                          "support is not yet implemented\n");
+        } else {
+                if (atomic_read(&clkdm->usecount) > 0)
+                        _clkdm_add_autodeps(clkdm);
+        }
 
         _omap2_clkdm_set_hwsup(clkdm, 1);
 
@@ -924,8 +939,17 @@ void omap2_clkdm_deny_idle(struct clockdomain *clkdm)
 
         _omap2_clkdm_set_hwsup(clkdm, 0);
 
-        if (atomic_read(&clkdm->usecount) > 0)
-                _clkdm_del_autodeps(clkdm);
+        /*
+         * XXX This should be removed once TI adds wakeup/sleep
+         * dependency code and data for OMAP4.
+         */
+        if (cpu_is_omap44xx()) {
+                WARN_ONCE(1, "clockdomain: OMAP4 wakeup/sleep dependency "
+                          "support is not yet implemented\n");
+        } else {
+                if (atomic_read(&clkdm->usecount) > 0)
+                        _clkdm_del_autodeps(clkdm);
+        }
 }
 
 
@@ -954,7 +978,7 @@ int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk)
          * downstream clocks for debugging purposes?
          */
 
-        if (!clkdm || !clk || !clkdm->clkstctrl_reg)
+        if (!clkdm || !clk)
                 return -EINVAL;
 
         if (atomic_inc_return(&clkdm->usecount) > 1)
@@ -965,6 +989,9 @@ int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk)
         pr_debug("clockdomain: clkdm %s: clk %s now enabled\n", clkdm->name,
                  clk->name);
 
+        if (!clkdm->clkstctrl_reg)
+                return 0;
+
         v = omap2_clkdm_clktrctrl_read(clkdm);
 
         if ((cpu_is_omap34xx() && v == OMAP34XX_CLKSTCTRL_ENABLE_AUTO) ||
@@ -1006,7 +1033,7 @@ int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk)
          * downstream clocks for debugging purposes?
          */
 
-        if (!clkdm || !clk || !clkdm->clkstctrl_reg)
+        if (!clkdm || !clk)
                 return -EINVAL;
 
 #ifdef DEBUG
@@ -1024,6 +1051,9 @@ int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk)
         pr_debug("clockdomain: clkdm %s: clk %s now disabled\n", clkdm->name,
                  clk->name);
 
+        if (!clkdm->clkstctrl_reg)
+                return 0;
+
         v = omap2_clkdm_clktrctrl_read(clkdm);
 
         if ((cpu_is_omap34xx() && v == OMAP34XX_CLKSTCTRL_ENABLE_AUTO) ||