]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Don't mask rtc-twl4030 alarm interrupts on shutdown
authormatti.halme@nokia.com <matti.halme@nokia.com>
Wed, 7 Jan 2009 07:10:07 +0000 (09:10 +0200)
committerTony Lindgren <tony@atomide.com>
Thu, 8 Jan 2009 12:22:26 +0000 (14:22 +0200)
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: Tony Lindgren <tony@atomide.com>
drivers/rtc/rtc-twl4030.c

index 01d8da9afdc8506f0469a3b8a8c6284b98a235fe..d933d097c38b3e1fe00eef7e4e74842ea0ecc6b4 100644 (file)
@@ -505,8 +505,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