Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cafa1d8b0c90252e73f20db1b6f32cf88e73ff17

Authored by Matti Halme
Committed by Linus Torvalds
1 parent 4216d0bd8f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

drivers/rtc/rtc-twl4030.c
Diff comments   View file @ cafa1d8
... ... @@ -482,8 +482,9 @@
482 482  
483 483 static void twl4030_rtc_shutdown(struct platform_device *pdev)
484 484 {
485   - mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M |
486   - BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
  485 + /* mask timer interrupts, but leave alarm interrupts on to enable
  486 + power-on when alarm is triggered */
  487 + mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
487 488 }
488 489  
489 490 #ifdef CONFIG_PM