The patch titled Subject: drivers/rtc/rtc-tps65910.c: enable/disable wake in suspend/resume has been removed from the -mm tree. Its filename was drivers-rtc-rtc-tps65910c-enable-disable-wake-in-suspend-resume.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Laxman Dewangan <ldewangan@xxxxxxxxxx> Subject: 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@xxxxxxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-tps65910.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff -puN drivers/rtc/rtc-tps65910.c~drivers-rtc-rtc-tps65910c-enable-disable-wake-in-suspend-resume drivers/rtc/rtc-tps65910.c --- a/drivers/rtc/rtc-tps65910.c~drivers-rtc-rtc-tps65910c-enable-disable-wake-in-suspend-resume +++ a/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 pla 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 pl 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 d 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, _ Patches currently in -mm which might be from ldewangan@xxxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html