Merge branch 'gpio-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index 374299ea7ade..7816c4e84a32 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -107,7 +107,7 @@ static void omap2_enter_full_retention(void)
         l = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0) | OMAP24XX_USBSTANDBYCTRL;
         omap_ctrl_writel(l, OMAP2_CONTROL_DEVCONF0);
 
-        omap2_gpio_prepare_for_retention();
+        omap2_gpio_prepare_for_idle(PWRDM_POWER_RET);
 
         if (omap2_pm_debug) {
                 omap2_pm_dump(0, 0, 0);
@@ -141,7 +141,7 @@ no_sleep:
                 tmp = timespec_to_ns(&ts_idle) * NSEC_PER_USEC;
                 omap2_pm_dump(0, 1, tmp);
         }
-        omap2_gpio_resume_after_retention();
+        omap2_gpio_resume_after_idle();
 
         clk_enable(osc_ck);
 
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index ea0000bc5358..468e1e3321e0 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -376,7 +376,7 @@ void omap_sram_idle(void)
         core_next_state = pwrdm_read_next_pwrst(core_pwrdm);
         if (per_next_state < PWRDM_POWER_ON) {
                 omap_uart_prepare_idle(2);
-                omap2_gpio_prepare_for_retention();
+                omap2_gpio_prepare_for_idle(per_next_state);
                 if (per_next_state == PWRDM_POWER_OFF) {
                         if (core_next_state == PWRDM_POWER_ON) {
                                 per_next_state = PWRDM_POWER_RET;
@@ -454,9 +454,9 @@ void omap_sram_idle(void)
         /* PER */
         if (per_next_state < PWRDM_POWER_ON) {
                 per_prev_state = pwrdm_read_prev_pwrst(per_pwrdm);
+                omap2_gpio_resume_after_idle();
                 if (per_prev_state == PWRDM_POWER_OFF)
                         omap3_per_restore_context();
-                omap2_gpio_resume_after_retention();
                 omap_uart_resume_idle(2);
                 if (per_state_modified)
                         pwrdm_set_next_pwrst(per_pwrdm, PWRDM_POWER_OFF);