* [merged] arm-davinci-remove-rtc-kicker-release.patch removed from -mm tree
@ 2012-12-18 20:07 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2012-12-18 20:07 UTC (permalink / raw)
To: afzal, a.zummo, grant.likely, hvaibhav, khilman, linux, nsekhar,
zonque, mm-commits
The patch titled
Subject: ARM: davinci: remove rtc kicker release
has been removed from the -mm tree. Its filename was
arm-davinci-remove-rtc-kicker-release.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Afzal Mohammed <afzal@ti.com>
Subject: 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>
---
arch/arm/mach-davinci/devices-da8xx.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff -puN arch/arm/mach-davinci/devices-da8xx.c~arm-davinci-remove-rtc-kicker-release arch/arm/mach-davinci/devices-da8xx.c
--- a/arch/arm/mach-davinci/devices-da8xx.c~arm-davinci-remove-rtc-kicker-release
+++ a/arch/arm/mach-davinci/devices-da8xx.c
@@ -725,7 +725,7 @@ static struct resource da8xx_rtc_resourc
};
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_
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);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-12-18 20:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-18 20:07 [merged] arm-davinci-remove-rtc-kicker-release.patch removed from -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox