1 files changed, 79 insertions, 54 deletions

diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index 39cfd2ee004..a3ad957507d 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -19,8 +19,8 @@
 #include <linux/interrupt.h>
 #include <linux/ioctl.h>
 #include <linux/slab.h>
-#include <linux/platform_data/atmel.h>
 
+#include <mach/board.h>
 #include <mach/at91_rtt.h>
 #include <mach/cpu.h>
 
@@ -57,8 +57,6 @@ struct sam9_rtc {
         void __iomem            *rtt;
         struct rtc_device       *rtcdev;
         u32                     imr;
-        void __iomem            *gpbr;
-        int                     irq;
 };
 
 #define rtt_readl(rtc, field) \
@@ -67,9 +65,9 @@ struct sam9_rtc {
         __raw_writel((val), (rtc)->rtt + AT91_RTT_ ## field)
 
 #define gpbr_readl(rtc) \
-        __raw_readl((rtc)->gpbr)
+        at91_sys_read(AT91_GPBR + 4 * CONFIG_RTC_DRV_AT91SAM9_GPBR)
 #define gpbr_writel(rtc, val) \
-        __raw_writel((val), (rtc)->gpbr)
+        at91_sys_write(AT91_GPBR + 4 * CONFIG_RTC_DRV_AT91SAM9_GPBR, (val))
 
 /*
  * Read current time and date in RTC
@@ -289,50 +287,28 @@ static const struct rtc_class_ops at91_rtc_ops = {
 /*
  * Initialize and install RTC driver
  */
-static int at91_rtc_probe(struct platform_device *pdev)
+static int __init at91_rtc_probe(struct platform_device *pdev)
 {
-        struct resource *r, *r_gpbr;
+        struct resource *r;
         struct sam9_rtc *rtc;
-        int             ret, irq;
+        int             ret;
         u32             mr;
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        r_gpbr = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        if (!r || !r_gpbr) {
-                dev_err(&pdev->dev, "need 2 ressources\n");
+        if (!r)
                 return -ENODEV;
-        }
-
-        irq = platform_get_irq(pdev, 0);
-        if (irq < 0) {
-                dev_err(&pdev->dev, "failed to get interrupt resource\n");
-                return irq;
-        }
 
         rtc = kzalloc(sizeof *rtc, GFP_KERNEL);
         if (!rtc)
                 return -ENOMEM;
 
-        rtc->irq = irq;
-
         /* platform setup code should have handled this; sigh */
         if (!device_can_wakeup(&pdev->dev))
                 device_init_wakeup(&pdev->dev, 1);
 
         platform_set_drvdata(pdev, rtc);
-        rtc->rtt = ioremap(r->start, resource_size(r));
-        if (!rtc->rtt) {
-                dev_err(&pdev->dev, "failed to map registers, aborting.\n");
-                ret = -ENOMEM;
-                goto fail;
-        }
-
-        rtc->gpbr = ioremap(r_gpbr->start, resource_size(r_gpbr));
-        if (!rtc->gpbr) {
-                dev_err(&pdev->dev, "failed to map gpbr registers, aborting.\n");
-                ret = -ENOMEM;
-                goto fail_gpbr;
-        }
+        rtc->rtt = (void __force __iomem *) (AT91_VA_BASE_SYS - AT91_BASE_SYS);
+        rtc->rtt += r->start;
 
         mr = rtt_readl(rtc, MR);
 
@@ -350,16 +326,17 @@ static int at91_rtc_probe(struct platform_device *pdev)
                                 &at91_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc->rtcdev)) {
                 ret = PTR_ERR(rtc->rtcdev);
-                goto fail_register;
+                goto fail;
         }
 
         /* register irq handler after we know what name we'll use */
-        ret = request_irq(rtc->irq, at91_rtc_interrupt, IRQF_SHARED,
+        ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt,
+                                IRQF_DISABLED | IRQF_SHARED,
                                 dev_name(&rtc->rtcdev->dev), rtc);
         if (ret) {
-                dev_dbg(&pdev->dev, "can't share IRQ %d?\n", rtc->irq);
+                dev_dbg(&pdev->dev, "can't share IRQ %d?\n", AT91_ID_SYS);
                 rtc_device_unregister(rtc->rtcdev);
-                goto fail_register;
+                goto fail;
         }
 
         /* NOTE:  sam9260 rev A silicon has a ROM bug which resets the
@@ -374,10 +351,6 @@ static int at91_rtc_probe(struct platform_device *pdev)
 
         return 0;
 
-fail_register:
-        iounmap(rtc->gpbr);
-fail_gpbr:
-        iounmap(rtc->rtt);
 fail:
         platform_set_drvdata(pdev, NULL);
         kfree(rtc);
@@ -387,19 +360,17 @@ fail:
 /*
  * Disable and remove the RTC driver
  */
-static int at91_rtc_remove(struct platform_device *pdev)
+static int __exit at91_rtc_remove(struct platform_device *pdev)
 {
         struct sam9_rtc *rtc = platform_get_drvdata(pdev);
         u32             mr = rtt_readl(rtc, MR);
 
         /* disable all interrupts */
         rtt_writel(rtc, MR, mr & ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN));
-        free_irq(rtc->irq, rtc);
+        free_irq(AT91_ID_SYS, rtc);
 
         rtc_device_unregister(rtc->rtcdev);
 
-        iounmap(rtc->gpbr);
-        iounmap(rtc->rtt);
         platform_set_drvdata(pdev, NULL);
         kfree(rtc);
         return 0;
@@ -431,7 +402,7 @@ static int at91_rtc_suspend(struct platform_device *pdev,
         rtc->imr = mr & (AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN);
         if (rtc->imr) {
                 if (device_may_wakeup(&pdev->dev) && (mr & AT91_RTT_ALMIEN)) {
-                        enable_irq_wake(rtc->irq);
+                        enable_irq_wake(AT91_ID_SYS);
                         /* don't let RTTINC cause wakeups */
                         if (mr & AT91_RTT_RTTINCIEN)
                                 rtt_writel(rtc, MR, mr & ~AT91_RTT_RTTINCIEN);
@@ -449,7 +420,7 @@ static int at91_rtc_resume(struct platform_device *pdev)
 
         if (rtc->imr) {
                 if (device_may_wakeup(&pdev->dev))
-                        disable_irq_wake(rtc->irq);
+                        disable_irq_wake(AT91_ID_SYS);
                 mr = rtt_readl(rtc, MR);
                 rtt_writel(rtc, MR, mr | rtc->imr);
         }
@@ -462,18 +433,72 @@ static int at91_rtc_resume(struct platform_device *pdev)
 #endif
 
 static struct platform_driver at91_rtc_driver = {
-        .probe          = at91_rtc_probe,
-        .remove         = at91_rtc_remove,
+        .driver.name    = "rtc-at91sam9",
+        .driver.owner   = THIS_MODULE,
+        .remove         = __exit_p(at91_rtc_remove),
         .shutdown       = at91_rtc_shutdown,
         .suspend        = at91_rtc_suspend,
         .resume         = at91_rtc_resume,
-        .driver         = {
-                .name   = "rtc-at91sam9",
-                .owner  = THIS_MODULE,
-        },
 };
 
-module_platform_driver(at91_rtc_driver);
+/* Chips can have more than one RTT module, and they can be used for more
+ * than just RTCs.  So we can't just register as "the" RTT driver.
+ *
+ * A normal approach in such cases is to create a library to allocate and
+ * free the modules.  Here we just use bus_find_device() as like such a
+ * library, binding directly ... no runtime "library" footprint is needed.
+ */
+static int __init at91_rtc_match(struct device *dev, void *v)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        int ret;
+
+        /* continue searching if this isn't the RTT we need */
+        if (strcmp("at91_rtt", pdev->name) != 0
+                        || pdev->id != CONFIG_RTC_DRV_AT91SAM9_RTT)
+                goto fail;
+
+        /* else we found it ... but fail unless we can bind to the RTC driver */
+        if (dev->driver) {
+                dev_dbg(dev, "busy, can't use as RTC!\n");
+                goto fail;
+        }
+        dev->driver = &at91_rtc_driver.driver;
+        if (device_attach(dev) == 0) {
+                dev_dbg(dev, "can't attach RTC!\n");
+                goto fail;
+        }
+        ret = at91_rtc_probe(pdev);
+        if (ret == 0)
+                return true;
+
+        dev_dbg(dev, "RTC probe err %d!\n", ret);
+fail:
+        return false;
+}
+
+static int __init at91_rtc_init(void)
+{
+        int status;
+        struct device *rtc;
+
+        status = platform_driver_register(&at91_rtc_driver);
+        if (status)
+                return status;
+        rtc = bus_find_device(&platform_bus_type, NULL,
+                        NULL, at91_rtc_match);
+        if (!rtc)
+                platform_driver_unregister(&at91_rtc_driver);
+        return rtc ? 0 : -ENODEV;
+}
+module_init(at91_rtc_init);
+
+static void __exit at91_rtc_exit(void)
+{
+        platform_driver_unregister(&at91_rtc_driver);
+}
+module_exit(at91_rtc_exit);
+
 
 MODULE_AUTHOR("Michel Benoit");
 MODULE_DESCRIPTION("RTC driver for Atmel AT91SAM9x");