]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ARM: davinci: remove rtc kicker release
authorAfzal Mohammed <afzal@ti.com>
Tue, 18 Dec 2012 00:02:13 +0000 (16:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2012 01:15:20 +0000 (17:15 -0800)
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>
arch/arm/mach-davinci/devices-da8xx.c

index fcdbe437409e3a5141b5b7231a143fecf7c933a4..2d5502d84a223aaf9b0a05ccb80d284393c9a815 100644 (file)
@@ -725,7 +725,7 @@ static struct resource da8xx_rtc_resources[] = {
 };
 
 static struct platform_device da8xx_rtc_device = {
-       .name           = "omap_rtc",
+       .name           = "da830-rtc",
        .id             = -1,
        .num_resources  = ARRAY_SIZE(da8xx_rtc_resources),
        .resource       = da8xx_rtc_resources,
@@ -734,17 +734,6 @@ static struct platform_device da8xx_rtc_device = {
 int da8xx_register_rtc(void)
 {
        int ret;
-       void __iomem *base;
-
-       base = ioremap(DA8XX_RTC_BASE, SZ_4K);
-       if (WARN_ON(!base))
-               return -ENOMEM;
-
-       /* Unlock the rtc's registers */
-       __raw_writel(0x83e70b13, base + 0x6c);
-       __raw_writel(0x95a4f1e0, base + 0x70);
-
-       iounmap(base);
 
        ret = platform_device_register(&da8xx_rtc_device);
        if (!ret)