summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Halme <matti.halme@nokia.com>2009-01-15 22:50:56 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-16 01:39:36 +0100
commitcafa1d8b0c90252e73f20db1b6f32cf88e73ff17 (patch)
treebfe17370eadc0db4ff366a333cfc008f86d79003
parentrtc-pxa: fix build failure (diff)
downloadlinux-cafa1d8b0c90252e73f20db1b6f32cf88e73ff17.tar.xz
linux-cafa1d8b0c90252e73f20db1b6f32cf88e73ff17.zip
rtc: rtc-twl4030 don't mask alarm interrupts on shutdown
A triggering RTC alarm should be able to power on a device that has been powered off. This patch enables that on twl4030 by not masking the alarm interrupt at shutdown. Signed-off-by: Matti Halme <matti.halme@nokia.com> Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Cc: Tony Lindgren <tony@atomide.com> Cc: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-twl4030.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-twl4030.c b/drivers/rtc/rtc-twl4030.c
index 25dc3e1cedbe..ad35f76c46b7 100644
--- a/drivers/rtc/rtc-twl4030.c
+++ b/drivers/rtc/rtc-twl4030.c
@@ -482,8 +482,9 @@ static int __devexit twl4030_rtc_remove(struct platform_device *pdev)
static void twl4030_rtc_shutdown(struct platform_device *pdev)
{
- mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M |
- BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
+ /* mask timer interrupts, but leave alarm interrupts on to enable
+ power-on when alarm is triggered */
+ mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
}
#ifdef CONFIG_PM