Commit 8ad5c722 authored Dec 10, 2014 by Johan Hovold Committed by Linus Torvalds Dec 10, 2014

rtc: omap: enable wake-up from power off



The ALARM interrupt must not be disabled during shutdown in order to be
able to power up the system using an RTC alarm.

Signed-off-by: Johan Hovold <johan@kernel.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Benot Cousson <bcousson@baylibre.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Keerthy J <j-keerthy@ti.com>
Tested-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 222a12fc

drivers/rtc/rtc-omap.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -694,8 +694,15 @@ static SIMPLE_DEV_PM_OPS(omap_rtc_pm_ops, omap_rtc_suspend, omap_rtc_resume);
		static void omap_rtc_shutdown(struct platform_device *pdev)
		{
		struct omap_rtc *rtc = platform_get_drvdata(pdev);
		u8 mask;

		rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, 0);
		/*
		* Keep the ALARM interrupt enabled to allow the system to power up on
		* alarm events.
		*/
		mask = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
		mask &= OMAP_RTC_INTERRUPTS_IT_ALARM;
		rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, mask);
		}

		static struct platform_driver omap_rtc_driver = {