summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2013-02-21 16:44:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 17:22:28 -0800
commiteb5eba4ef72248b976465906cfed5fca2e9d8831 (patch)
tree9bbe3909fae02a5c134f095faea8d27ed2690423 /drivers/rtc
parent36d6182411b9f597f9f85ec0c4bb00909fd16d59 (diff)
downloadop-kernel-dev-eb5eba4ef72248b976465906cfed5fca2e9d8831.zip
op-kernel-dev-eb5eba4ef72248b976465906cfed5fca2e9d8831.tar.gz
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>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-tps65910.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-tps65910.c b/drivers/rtc/rtc-tps65910.c
index e5fef14..932a655 100644
--- 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,
OpenPOWER on IntegriCloud