drivers/rtc/rtc-tps65910.c: enable/disable wake in suspend/resume

Making the rtc driver as wakeup capabale and leaving the wake
enable/disable decision to user space through a sysfs attribute.

In suspend, enable wake if device wakeup enabled.  In resume disable wake
again.

This change is inline with the Documentation/power/devices.txt#
/sys/devices/.../power/wakeup files

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/rtc/rtc-tps65910.c b/drivers/rtc/rtc-tps65910.c
index e5fef141a0e21f4dfefa977596e05c5873b486c1..932a655aa41ceb28e250fec873b80d6ae61441bc 100644 (file)
--- a/drivers/rtc/rtc-tps65910.c
+++ b/drivers/rtc/rtc-tps65910.c
@@ -27,6 +27,7 @@
 
 struct tps65910_rtc {
        struct rtc_device       *rtc;
+       int irq;
        /* To store the list of enabled interrupts */
        u32 irqstat;
 };
@@ -273,7 +274,8 @@ static int tps65910_rtc_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "IRQ is not free.\n");
                return ret;
        }
-       device_init_wakeup(&pdev->dev, 1);
+       tps_rtc->irq = irq;
+       device_set_wakeup_capable(&pdev->dev, 1);
 
        tps_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
                &tps65910_rtc_ops, THIS_MODULE);
@@ -308,9 +310,13 @@ static int tps65910_rtc_remove(struct platform_device *pdev)
 static int tps65910_rtc_suspend(struct device *dev)
 {
        struct tps65910 *tps = dev_get_drvdata(dev->parent);
+       struct tps65910_rtc *tps_rtc = dev_get_drvdata(dev);
        u8 alarm = TPS65910_RTC_INTERRUPTS_IT_ALARM;
        int ret;
 
+       if (device_may_wakeup(dev))
+               enable_irq_wake(tps_rtc->irq);
+
        /* Store current list of enabled interrupts*/
        ret = regmap_read(tps->regmap, TPS65910_RTC_INTERRUPTS,
                &tps->rtc->irqstat);
@@ -324,6 +330,10 @@ static int tps65910_rtc_suspend(struct device *dev)
 static int tps65910_rtc_resume(struct device *dev)
 {
        struct tps65910 *tps = dev_get_drvdata(dev->parent);
+       struct tps65910_rtc *tps_rtc = dev_get_drvdata(dev);
+
+       if (device_may_wakeup(dev))
+               disable_irq_wake(tps_rtc->irq);
 
        /* Restore list of enabled interrupts before suspend */
        return regmap_write(tps->regmap, TPS65910_RTC_INTERRUPTS,