OMAP3: PM: Fix for MPU power domain MEM BANK position

[linux-beck.git] / arch / arm / mach-omap2 / powerdomain.c

diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index f00289abd30f6f51d015f6f3cf932d77eb868ffc..26b3f3ee82a33abc92bd38427a47512d68955c48 100644 (file)
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -10,9 +10,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#ifdef CONFIG_OMAP_DEBUG_POWERDOMAIN
-# define DEBUG
-#endif
+#undef DEBUG
 
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -31,9 +29,9 @@
 #include "prm.h"
 #include "prm-regbits-34xx.h"
 
-#include <mach/cpu.h>
-#include <mach/powerdomain.h>
-#include <mach/clockdomain.h>
+#include <plat/cpu.h>
+#include <plat/powerdomain.h>
+#include <plat/clockdomain.h>
 
 #include "pm.h"
 
@@ -160,7 +158,7 @@ static __init void _pwrdm_setup(struct powerdomain *pwrdm)
 {
        int i;
 
-       for (i = 0; i < 4; i++)
+       for (i = 0; i < PWRDM_MAX_PWRSTS; i++)
                pwrdm->state_counter[i] = 0;
 
        pwrdm_wait_transition(pwrdm);
@@ -480,7 +478,7 @@ int pwrdm_add_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
        if (IS_ERR(p)) {
                pr_debug("powerdomain: hardware cannot set/clear wake up of "
                         "%s when %s wakes up\n", pwrdm1->name, pwrdm2->name);
-               return IS_ERR(p);
+               return PTR_ERR(p);
        }
 
        pr_debug("powerdomain: hardware will wake up %s when %s wakes up\n",
@@ -513,7 +511,7 @@ int pwrdm_del_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
        if (IS_ERR(p)) {
                pr_debug("powerdomain: hardware cannot set/clear wake up of "
                         "%s when %s wakes up\n", pwrdm1->name, pwrdm2->name);
-               return IS_ERR(p);
+               return PTR_ERR(p);
        }
 
        pr_debug("powerdomain: hardware will no longer wake up %s after %s "
@@ -550,7 +548,7 @@ int pwrdm_read_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
        if (IS_ERR(p)) {
                pr_debug("powerdomain: hardware cannot set/clear wake up of "
                         "%s when %s wakes up\n", pwrdm1->name, pwrdm2->name);
-               return IS_ERR(p);
+               return PTR_ERR(p);
        }
 
        return prm_read_mod_bits_shift(pwrdm1->prcm_offs, PM_WKDEP,
@@ -573,10 +571,10 @@ int pwrdm_add_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
 {
        struct powerdomain *p;
 
-       if (!pwrdm1)
+       if (!cpu_is_omap34xx())
                return -EINVAL;
 
-       if (!cpu_is_omap34xx())
+       if (!pwrdm1)
                return -EINVAL;
 
        p = _pwrdm_deps_lookup(pwrdm2, pwrdm1->sleepdep_srcs);
@@ -584,7 +582,7 @@ int pwrdm_add_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
                pr_debug("powerdomain: hardware cannot set/clear sleep "
                         "dependency affecting %s from %s\n", pwrdm1->name,
                         pwrdm2->name);
-               return IS_ERR(p);
+               return PTR_ERR(p);
        }
 
        pr_debug("powerdomain: will prevent %s from sleeping if %s is active\n",
@@ -612,10 +610,10 @@ int pwrdm_del_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
 {
        struct powerdomain *p;
 
-       if (!pwrdm1)
+       if (!cpu_is_omap34xx())
                return -EINVAL;
 
-       if (!cpu_is_omap34xx())
+       if (!pwrdm1)
                return -EINVAL;
 
        p = _pwrdm_deps_lookup(pwrdm2, pwrdm1->sleepdep_srcs);
@@ -623,7 +621,7 @@ int pwrdm_del_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
                pr_debug("powerdomain: hardware cannot set/clear sleep "
                         "dependency affecting %s from %s\n", pwrdm1->name,
                         pwrdm2->name);
-               return IS_ERR(p);
+               return PTR_ERR(p);
        }
 
        pr_debug("powerdomain: will no longer prevent %s from sleeping if "
@@ -655,10 +653,10 @@ int pwrdm_read_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
 {
        struct powerdomain *p;
 
-       if (!pwrdm1)
+       if (!cpu_is_omap34xx())
                return -EINVAL;
 
-       if (!cpu_is_omap34xx())
+       if (!pwrdm1)
                return -EINVAL;
 
        p = _pwrdm_deps_lookup(pwrdm2, pwrdm1->sleepdep_srcs);
@@ -666,7 +664,7 @@ int pwrdm_read_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
                pr_debug("powerdomain: hardware cannot set/clear sleep "
                         "dependency affecting %s from %s\n", pwrdm1->name,
                         pwrdm2->name);
-               return IS_ERR(p);
+               return PTR_ERR(p);
        }
 
        return prm_read_mod_bits_shift(pwrdm1->prcm_offs, OMAP3430_CM_SLEEPDEP,
@@ -985,6 +983,9 @@ int pwrdm_read_mem_pwrst(struct powerdomain *pwrdm, u8 bank)
        if (pwrdm->banks < (bank + 1))
                return -EEXIST;
 
+       if (pwrdm->flags & PWRDM_HAS_MPU_QUIRK)
+               bank = 1;
+
        /*
         * The register bit names below may not correspond to the
         * actual names of the bits in each powerdomain's register,
@@ -1032,6 +1033,9 @@ int pwrdm_read_prev_mem_pwrst(struct powerdomain *pwrdm, u8 bank)
        if (pwrdm->banks < (bank + 1))
                return -EEXIST;
 
+       if (pwrdm->flags & PWRDM_HAS_MPU_QUIRK)
+               bank = 1;
+
        /*
         * The register bit names below may not correspond to the
         * actual names of the bits in each powerdomain's register,