From d3e93e28b3372ecf298ed7386df18db54b0ffb7d Mon Sep 17 00:00:00 2001
From: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Wed, 3 Sep 2008 15:41:57 -0700
Subject: [PATCH] --- yaml --- r: 113099 b: refs/heads/master c:
 64151ad5b3a03e236390d6d5160805ee4f4e7c67 h: refs/heads/master i:   113097:
 3480179041a81c24b87c6c10c849b779e8f8c8ab   113095:
 dca2fdfa7f687a0f95e63d5d5ead369e764b7343 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/rtc/rtc-m48t59.c   | 14 ++++++++++----
 trunk/include/linux/rtc/m48t59.h |  2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 57057ed152ef..e56d26d5df6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94fe7424a4c21940b4569200faaf0a0a5efd2924
+refs/heads/master: 64151ad5b3a03e236390d6d5160805ee4f4e7c67
diff --git a/trunk/drivers/rtc/rtc-m48t59.c b/trunk/drivers/rtc/rtc-m48t59.c
index 50f9f10b32f0..867c8a79a6a8 100644
--- a/trunk/drivers/rtc/rtc-m48t59.c
+++ b/trunk/drivers/rtc/rtc-m48t59.c
@@ -411,9 +411,14 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)
 	if (!m48t59)
 		return -ENOMEM;
 
-	m48t59->ioaddr = ioremap(res->start, res->end - res->start + 1);
-	if (!m48t59->ioaddr)
-		goto out;
+	m48t59->ioaddr = pdata->ioaddr;
+
+	if (!m48t59->ioaddr) {
+		/* ioaddr not mapped externally */
+		m48t59->ioaddr = ioremap(res->start, res->end - res->start + 1);
+		if (!m48t59->ioaddr)
+			goto out;
+	}
 
 	/* Try to get irq number. We also can work in
 	 * the mode without IRQ.
@@ -481,11 +486,12 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)
 static int __devexit m48t59_rtc_remove(struct platform_device *pdev)
 {
 	struct m48t59_private *m48t59 = platform_get_drvdata(pdev);
+	struct m48t59_plat_data *pdata = pdev->dev.platform_data;
 
 	sysfs_remove_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
 	if (!IS_ERR(m48t59->rtc))
 		rtc_device_unregister(m48t59->rtc);
-	if (m48t59->ioaddr)
+	if (m48t59->ioaddr && !pdata->ioaddr)
 		iounmap(m48t59->ioaddr);
 	if (m48t59->irq != NO_IRQ)
 		free_irq(m48t59->irq, &pdev->dev);
diff --git a/trunk/include/linux/rtc/m48t59.h b/trunk/include/linux/rtc/m48t59.h
index 41798505d157..6fc961459b4a 100644
--- a/trunk/include/linux/rtc/m48t59.h
+++ b/trunk/include/linux/rtc/m48t59.h
@@ -55,6 +55,8 @@ struct m48t59_plat_data {
 
 	int type; /* RTC model */
 
+	/* ioaddr mapped externally */
+	void __iomem *ioaddr;
 	/* offset to RTC registers, automatically set according to the type */
 	unsigned int offset;
 };