]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: davinci: da8xx: remove hard coding of rtc device wakeup
authorHebbar Gururaja <gururaja.hebbar@ti.com>
Wed, 3 Jul 2013 08:47:03 +0000 (14:17 +0530)
committerSekhar Nori <nsekhar@ti.com>
Wed, 21 Aug 2013 19:09:00 +0000 (00:39 +0530)
Since now rtc-omap driver itself calls deice_init_wakeup(dev, true),
duplicate call from the rtc device registration can be removed.

This is basically a partial revert of the prev commit

commit 75c99bb0006ee065b4e2995078d779418b0fab54
Author: Sekhar Nori <nsekhar@ti.com>

    davinci: da8xx/omap-l1: mark RTC as a wakeup source

Signed-off-by: Hebbar Gururaja <gururaja.hebbar@ti.com>
Acked-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
arch/arm/mach-davinci/devices-da8xx.c

index 280f67df92b5d21e507eb6ef6eb257bfbceccf4c..a478d179dae32495758de7c95134df00b70fa08e 100644 (file)
@@ -856,14 +856,7 @@ static struct platform_device da8xx_rtc_device = {
 
 int da8xx_register_rtc(void)
 {
-       int ret;
-
-       ret = platform_device_register(&da8xx_rtc_device);
-       if (!ret)
-               /* Atleast on DA850, RTC is a wakeup source */
-               device_init_wakeup(&da8xx_rtc_device.dev, true);
-
-       return ret;
+       return platform_device_register(&da8xx_rtc_device);
 }
 
 static void __iomem *da8xx_ddr2_ctlr_base;