summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Kyuwon <q1.kim@samsung.com>2009-05-12 13:19:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-12 14:11:35 -0700
commitf993004d73f266a02f3ac736fafb033c600972d9 (patch)
tree14cc0c73e4efa6ecf761a9dc6ad9f827d01aea6f
parentecf4667d30dd63fa130e22f8f2da3e6ce003358b (diff)
downloadlinux-f993004d73f266a02f3ac736fafb033c600972d9.tar.gz
linux-f993004d73f266a02f3ac736fafb033c600972d9.tar.bz2
linux-f993004d73f266a02f3ac736fafb033c600972d9.zip
rtc: rtc-twl4030 don't mask alarm interrupts on suspend
This patch enables the alarm interrupt of TWL4030 RTC to wake up the system from suspend. You can test this patch with following command. # echo +10 > /sys/class/rtc/rtc0/wakealarm; echo mem > /sys/power/state; Signed-off-by: Kim Kyuwon <q1.kim@samsung.com> Acked-by: David Brownell <david-b@pacbell.net> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Alessandro Zummo <a.zummo@towertech.it> 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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-twl4030.c b/drivers/rtc/rtc-twl4030.c
index a6341e4f9a0f..9c8c70c497dc 100644
--- a/drivers/rtc/rtc-twl4030.c
+++ b/drivers/rtc/rtc-twl4030.c
@@ -495,9 +495,7 @@ static int twl4030_rtc_suspend(struct platform_device *pdev, pm_message_t state)
{
irqstat = rtc_irq_bits;
- /* REVISIT alarm may need to wake us from sleep */
- mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M |
- BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
+ mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
return 0;
}