ARM: OMAP4: PM: Add MPUSS power domain OSWR support

[deliverable/linux.git] / arch / arm / mach-omap2 / pm44xx.c

diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index 6dc9bbe0a4a87d0732792d7e103ad8bafa09c9c8..92daae07d634f071a3b82903ed966f1bbbcd6e0c 100644 (file)
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -27,6 +27,7 @@ struct power_state {
        u32 next_state;
 #ifdef CONFIG_SUSPEND
        u32 saved_state;
+       u32 saved_logic_state;
 #endif
        struct list_head node;
 };
@@ -43,11 +44,13 @@ static int omap4_pm_suspend(void)
        /* Save current powerdomain state */
        list_for_each_entry(pwrst, &pwrst_list, node) {
                pwrst->saved_state = pwrdm_read_next_pwrst(pwrst->pwrdm);
+               pwrst->saved_logic_state = pwrdm_read_logic_retst(pwrst->pwrdm);
        }
 
        /* Set targeted power domain states by suspend */
        list_for_each_entry(pwrst, &pwrst_list, node) {
                omap_set_pwrdm_state(pwrst->pwrdm, pwrst->next_state);
+               pwrdm_set_logic_retst(pwrst->pwrdm, PWRDM_POWER_OFF);
        }
 
        /*
@@ -71,6 +74,7 @@ static int omap4_pm_suspend(void)
                        ret = -1;
                }
                omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
+               pwrdm_set_logic_retst(pwrst->pwrdm, pwrst->saved_logic_state);
        }
        if (ret)
                pr_crit("Could not enter target state in pm_suspend\n");