Patchwork [77/93] drivers/rtc/rtc-twl.c: fix missing device_init_wakeup() when booted with device tree

mail settings
Submitter Luis Henriques
Date June 18, 2013, 11:43 a.m.
Message ID <>
Download mbox | patch
Permalink /patch/252323/
State New
Headers show


Luis Henriques - June 18, 2013, 11:43 a.m. -stable review patch.  If anyone has any objections, please let me know.


From: Tony Lindgren <>

commit 24b8256a1fb28d357bc6fa09184ba29b4255ba5c upstream.

When booted in legacy mode device_init_wakeup() gets called by
drivers/mfd/twl-core.c when the children are initialized.  However, when
booted using device tree, the children are created with
of_platform_populate() instead add_children().

This means that the RTC driver will not have device_init_wakeup() set,
and we need to call it from the driver probe like RTC drivers typically

Without this we cannot test PM wake-up events on omaps for cases where
there may not be any physical wake-up event.

Signed-off-by: Tony Lindgren <>
Reported-by: Kevin Hilman <>
Cc: Alessandro Zummo <>
Cc: Jingoo Han <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
Signed-off-by: Luis Henriques <>
 drivers/rtc/rtc-twl.c | 1 +
 1 file changed, 1 insertion(+)


diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index 9277d94..1789a25 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -523,6 +523,7 @@  static int __devinit twl_rtc_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, rtc);
+	device_init_wakeup(&pdev->dev, 1);
 	return 0;