From 07cb6b7c86f684c87dbbd60fb3c4f453701aeb64 Mon Sep 17 00:00:00 2001
From: Afzal Mohammed <afzal@ti.com>
Date: Mon, 17 Dec 2012 16:02:13 -0800
Subject: [PATCH] --- yaml --- r: 346428 b: refs/heads/master c:
 852168c92322d3b28de01514dccf25945be92b0b h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/arm/mach-davinci/devices-da8xx.c | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 108a55accd70..972344418d2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cab1458c8c4fdfc993e86454eef785bc39517dd8
+refs/heads/master: 852168c92322d3b28de01514dccf25945be92b0b
diff --git a/trunk/arch/arm/mach-davinci/devices-da8xx.c b/trunk/arch/arm/mach-davinci/devices-da8xx.c
index fcdbe437409e..2d5502d84a22 100644
--- a/trunk/arch/arm/mach-davinci/devices-da8xx.c
+++ b/trunk/arch/arm/mach-davinci/devices-da8xx.c
@@ -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)