summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/twl6030-irq.c
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2011-09-27 01:44:24 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2011-10-24 14:09:17 +0200
commit782baa20b201100e14ce065bb7b890169e7a5d3c (patch)
treea1e65c51e6750bc0c1b0bf890325bd08f2acb160 /drivers/mfd/twl6030-irq.c
parentmfd: Fix twl6030 lockdep recursion warning on setting wake IRQs (diff)
downloadlinux-782baa20b201100e14ce065bb7b890169e7a5d3c.tar.xz
linux-782baa20b201100e14ce065bb7b890169e7a5d3c.zip
mfd: Disable twl6030 IRQ during suspend
Module IRQs may still be disabled by DPM at the time the TWL6030 ISR runs, causing handle_simple_irq() to silently do nothing. This may result in missing TWL RTC alarm wakeups, for example, since the RTC child module ISR is not called to ack the IRQ. Disable the TWL6030 IRQ during suspend, enable it at DPM resume time, at which time the child module IRQs will be re-enabled. Signed-off-by: Todd Poynor <toddpoynor@google.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/twl6030-irq.c')
-rw-r--r--drivers/mfd/twl6030-irq.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index a014ec489e68..deec3ec858bf 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -109,7 +109,13 @@ static int twl6030_irq_pm_notifier(struct notifier_block *notifier,
twl_irq_wake_enabled = false;
}
+ disable_irq(twl_irq);
break;
+
+ case PM_POST_SUSPEND:
+ enable_irq(twl_irq);
+ break;
+
default:
break;
}