Merge tag 'omap-devel-b-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git...

On OMAP2+ devices, standardize and clean up WFI entry and WFI blocking.

Basic test logs are available here:

   http://www.pwsan.com/omap/testlogs/wfi_devel_a_3.9/20130208085027/

Conflicts:
	arch/arm/mach-omap2/pm24xx.c

diff --cc arch/arm/mach-omap2/pm24xx.c
index b2a4df623545a6065eea40652276f7fbf37757ff,bc44bcd6445118c0a2fc39bbaa07f5aa6631f2b7..b59d93908341bc91f10e9fae9692e7d3c322198c
--- 1/arch/arm/mach-omap2/pm24xx.c
--- 2/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@@ -172,16 -174,18 +173,17 @@@ static void omap2_enter_mpu_retention(v
                omap2_prm_write_mod_reg(0xffffffff, WKUP_MOD, PM_WKST);
  
                /* Try to enter MPU retention */
 -              omap2_prm_write_mod_reg((0x01 << OMAP_POWERSTATE_SHIFT) |
 -                                OMAP_LOGICRETSTATE_MASK,
 -                                MPU_MOD, OMAP2_PM_PWSTCTRL);
 +              pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_RET);
 +
        } else {
                /* Block MPU retention */
 -
 -              omap2_prm_write_mod_reg(OMAP_LOGICRETSTATE_MASK, MPU_MOD,
 -                                               OMAP2_PM_PWSTCTRL);
 +              pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
        }
  
-       omap2_sram_idle();
+       /* WFI */
+       asm("mcr p15, 0, %0, c7, c0, 4" : : "r" (zero) : "memory", "cc");
 +
 +      pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
  }
  
  static int omap2_can_sleep(void)