ARM: OMAP2+: Allow core oswr for omap4

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / pm44xx.c

diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index 485550af250623109eca94fa0e9442dea99b08fe..5a7a949ae96566391c85973c456c653abf1c92b0 100644 (file)
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -128,18 +128,9 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
                return 0;
        }
 
-       /*
-        * Bootloader or kexec boot may have LOGICRETSTATE cleared
-        * for some domains. This is the case when kexec booting from
-        * Android kernels that support off mode for example.
-        * Make sure it's set at least for core and per, otherwise
-        * we currently will see lost GPIO interrupts for wlcore and
-        * smsc911x at least if per hits retention during idle.
-        */
        if (!strncmp(pwrdm->name, "core", 4) ||
-           !strncmp(pwrdm->name, "l4per", 5) ||
-           !strncmp(pwrdm->name, "wkup", 4))
-               pwrdm_set_logic_retst(pwrdm, PWRDM_POWER_RET);
+           !strncmp(pwrdm->name, "l4per", 5))
+               pwrdm_set_logic_retst(pwrdm, PWRDM_POWER_OFF);
 
        pwrst = kmalloc(sizeof(struct power_state), GFP_ATOMIC);
        if (!pwrst)