summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-06-12 14:04:48 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-20 11:58:43 -0700
commite053ee3fe9c40827f2a3fce73b36f2f892a43292 (patch)
treebec224fafb80347117c1c7386c1be7cbdde724f9
parentc7ed0848c61d75c58f1c5b13c308f7fcaf94ed89 (diff)
downloadlinux-3.10-e053ee3fe9c40827f2a3fce73b36f2f892a43292.tar.gz
linux-3.10-e053ee3fe9c40827f2a3fce73b36f2f892a43292.tar.bz2
linux-3.10-e053ee3fe9c40827f2a3fce73b36f2f892a43292.zip
drivers/rtc/rtc-twl.c: fix missing device_init_wakeup() when booted with device tree
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@atomide.com> Reported-by: Kevin Hilman <khilman@linaro.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/rtc/rtc-twl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index 63ccc0f9427..c5ce19574d8 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;
out2: