diff options
| author | Hebbar Gururaja <gururaja.hebbar@ti.com> | 2013-07-03 14:17:03 +0530 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2013-08-22 00:39:00 +0530 |
| commit | 79eb16366beb013a2c812b60ffc2f4c92f58ec02 (patch) | |
| tree | f0e13db407e11e298a503b84ed08e35c52b54434 /arch/arm/mach-davinci/devices-da8xx.c | |
| parent | 323761bb7518d27c62c1514156cb3243930b55c1 (diff) | |
| download | linux-stable-79eb16366beb013a2c812b60ffc2f4c92f58ec02.tar.gz linux-stable-79eb16366beb013a2c812b60ffc2f4c92f58ec02.tar.bz2 linux-stable-79eb16366beb013a2c812b60ffc2f4c92f58ec02.zip | |
ARM: davinci: da8xx: remove hard coding of rtc device wakeup
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>
Diffstat (limited to 'arch/arm/mach-davinci/devices-da8xx.c')
| -rw-r--r-- | arch/arm/mach-davinci/devices-da8xx.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 280f67df92b5..a478d179dae3 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -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; |