Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

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

diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index b5efe58c0be09cb4953dfcb70e0e93f21524a721..6a764af6c6d3cbf3f476d673fe2baa924cb60490 100644 (file)
--- 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 */