diff options
author | Paul Walmsley <paul@pwsan.com> | 2013-01-26 08:48:56 +0100 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2013-01-26 09:42:33 +0100 |
commit | aff2f7d90fc6553aa309db2a635d8e5d70d84916 (patch) | |
tree | 80fa1aa61a364aa6afaa1d14a92870e647954f5e /arch/arm/mach-omap2/pm24xx.c | |
parent | ARM: OMAP2+: hwmod: add support for blocking WFI when a device is active (diff) | |
download | linux-aff2f7d90fc6553aa309db2a635d8e5d70d84916.tar.xz linux-aff2f7d90fc6553aa309db2a635d8e5d70d84916.zip |
ARM: OMAP2420: hwmod data/PM: use hwmod to block WFI when I2C active
Use the HWMOD_BLOCK_WFI flag in the hwmod data to prevent the MPU from
entering WFI when the I2C devices are active. No idea why this is needed;
this could certainly bear further investigation if anyone is interested.
The objective here is to remove some custom code from the OMAP24xx PM
code.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm24xx.c')
-rw-r--r-- | arch/arm/mach-omap2/pm24xx.c | 13 |
1 files changed, 0 insertions, 13 deletions
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()) { |