aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci
diff options
context:
space:
mode:
authorAfzal Mohammed <afzal@ti.com>2012-12-17 19:02:13 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-17 20:15:20 -0500
commit852168c92322d3b28de01514dccf25945be92b0b (patch)
treede5ab9dfe7cc3320ad9ded6f9a8b4640789e1d5d /arch/arm/mach-davinci
parentcab1458c8c4fdfc993e86454eef785bc39517dd8 (diff)
ARM: davinci: remove rtc kicker release
rtc-omap driver is now capable of handling kicker mechanism, hence remove kicker handling at platform level, instead provide proper device name so that driver can handle kicker mechanism by itself Signed-off-by: Afzal Mohammed <afzal@ti.com> Acked-by: Sekhar Nori <nsekhar@ti.com> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@ti.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Daniel Mack <zonque@gmail.com> Cc: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r--arch/arm/mach-davinci/devices-da8xx.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index fcdbe437409e..2d5502d84a22 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -725,7 +725,7 @@ static struct resource da8xx_rtc_resources[] = {
725}; 725};
726 726
727static struct platform_device da8xx_rtc_device = { 727static struct platform_device da8xx_rtc_device = {
728 .name = "omap_rtc", 728 .name = "da830-rtc",
729 .id = -1, 729 .id = -1,
730 .num_resources = ARRAY_SIZE(da8xx_rtc_resources), 730 .num_resources = ARRAY_SIZE(da8xx_rtc_resources),
731 .resource = da8xx_rtc_resources, 731 .resource = da8xx_rtc_resources,
@@ -734,17 +734,6 @@ static struct platform_device da8xx_rtc_device = {
734int da8xx_register_rtc(void) 734int da8xx_register_rtc(void)
735{ 735{
736 int ret; 736 int ret;
737 void __iomem *base;
738
739 base = ioremap(DA8XX_RTC_BASE, SZ_4K);
740 if (WARN_ON(!base))
741 return -ENOMEM;
742
743 /* Unlock the rtc's registers */
744 __raw_writel(0x83e70b13, base + 0x6c);
745 __raw_writel(0x95a4f1e0, base + 0x70);
746
747 iounmap(base);
748 737
749 ret = platform_device_register(&da8xx_rtc_device); 738 ret = platform_device_register(&da8xx_rtc_device);
750 if (!ret) 739 if (!ret)