2 files changed, 6 insertions, 14 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index b5efe58c0be0..6a764af6c6d3 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -121,7 +121,12 @@ static struct omap_hwmod omap2420_i2c1_hwmod = {
         },
         .class          = &i2c_class,
         .dev_attr       = &i2c_dev_attr,
-        .flags          = HWMOD_16BIT_REG,
+        /*
+         * From mach-omap2/pm24xx.c: "Putting MPU into the WFI state
+         * while a transfer is active seems to cause the I2C block to
+         * timeout. Why? Good question."
+         */
+        .flags          = (HWMOD_16BIT_REG | HWMOD_BLOCK_WFI),
 };
 
 /* I2C2 */
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index c333fa6dffa8..909ef53ba2ea 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -140,14 +140,6 @@ no_sleep:
         return 0;
 }
 
-static int omap2_i2c_active(void)
-{
-        u32 l;
-
-        l = omap2_cm_read_mod_reg(CORE_MOD, CM_FCLKEN1);
-        return l & (OMAP2420_EN_I2C2_MASK | OMAP2420_EN_I2C1_MASK);
-}
-
 static int sti_console_enabled;
 
 static int omap2_allow_mpu_retention(void)
@@ -172,11 +164,6 @@ static int omap2_allow_mpu_retention(void)
 
 static void omap2_enter_mpu_retention(void)
 {
-        /* Putting MPU into the WFI state while a transfer is active
-         * seems to cause the I2C block to timeout. Why? Good question. */
-        if (omap2_i2c_active())
-                return;
-
         /* The peripherals seem not to be able to wake up the MPU when
          * it is in retention mode. */
         if (omap2_allow_mpu_retention()) {