1 files changed, 2 insertions, 2 deletions

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);