[PATCH 78/84] drivers/rtc/rtc-twl.c: fix missing device_init_wakeup() when booted with device tree
Kamal Mostafa
kamal at canonical.com
Mon Jun 17 17:31:22 UTC 2013
3.8.13.3 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <tony at atomide.com>
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
do.
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 <tony at atomide.com>
Reported-by: Kevin Hilman <khilman at linaro.org>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Cc: Jingoo Han <jg1.han at samsung.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
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 ccd4ad3..5cb7720 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -523,6 +523,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
}
platform_set_drvdata(pdev, rtc);
+ device_init_wakeup(&pdev->dev, 1);
return 0;
out2:
--
1.8.1.2
More information about the kernel-team
mailing list