8 files changed, 229 insertions, 77 deletions

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index be5a6b73e601..40845c7e9322 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -226,6 +226,7 @@ static void __exit rtc_exit(void)
 {
         rtc_dev_exit();
         class_destroy(rtc_class);
+        idr_destroy(&rtc_idr);
 }
 
 subsys_initcall(rtc_init);
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index 86c61f143515..78a018b5c941 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -161,7 +161,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
         if (offset == 0)
                 return -EILSEQ;
 
-        memset(alrm, 0, sizeof(alrm));
+        memset(alrm, 0, sizeof(*alrm));
         if (alarm != ALARM_DISABLED && offset != 0) {
                 rtc_time_to_tm(offset + alarm, tm);
 
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index 03ea530981d1..44c4399ee714 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -271,12 +271,13 @@ static int coh901331_resume(struct platform_device *pdev)
 {
         struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
 
-        if (device_may_wakeup(&pdev->dev))
+        if (device_may_wakeup(&pdev->dev)) {
                 disable_irq_wake(rtap->irq);
-        else
+        } else {
                 clk_enable(rtap->clk);
                 writel(rtap->irqmaskstore, rtap->virtbase + COH901331_IRQ_MASK);
                 clk_disable(rtap->clk);
+        }
         return 0;
 }
 #else
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index 9da02d108b73..91bde976bc0f 100644
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -115,6 +115,15 @@ static ssize_t ep93xx_rtc_show_comp_delete(struct device *dev,
 }
 static DEVICE_ATTR(comp_delete, S_IRUGO, ep93xx_rtc_show_comp_delete, NULL);
 
+static struct attribute *ep93xx_rtc_attrs[] = {
+        &dev_attr_comp_preload.attr,
+        &dev_attr_comp_delete.attr,
+        NULL
+};
+
+static const struct attribute_group ep93xx_rtc_sysfs_files = {
+        .attrs  = ep93xx_rtc_attrs,
+};
 
 static int __init ep93xx_rtc_probe(struct platform_device *pdev)
 {
@@ -123,27 +132,22 @@ static int __init ep93xx_rtc_probe(struct platform_device *pdev)
         struct rtc_device *rtc;
         int err;
 
-        ep93xx_rtc = kzalloc(sizeof(struct ep93xx_rtc), GFP_KERNEL);
-        if (ep93xx_rtc == NULL)
+        ep93xx_rtc = devm_kzalloc(&pdev->dev, sizeof(*ep93xx_rtc), GFP_KERNEL);
+        if (!ep93xx_rtc)
                 return -ENOMEM;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res == NULL) {
-                err = -ENXIO;
-                goto fail_free;
-        }
+        if (!res)
+                return -ENXIO;
 
-        res = request_mem_region(res->start, resource_size(res), pdev->name);
-        if (res == NULL) {
-                err = -EBUSY;
-                goto fail_free;
-        }
+        if (!devm_request_mem_region(&pdev->dev, res->start,
+                                     resource_size(res), pdev->name))
+                return -EBUSY;
 
-        ep93xx_rtc->mmio_base = ioremap(res->start, resource_size(res));
-        if (ep93xx_rtc->mmio_base == NULL) {
-                err = -ENXIO;
-                goto fail;
-        }
+        ep93xx_rtc->mmio_base = devm_ioremap(&pdev->dev, res->start,
+                                             resource_size(res));
+        if (!ep93xx_rtc->mmio_base)
+                return -ENXIO;
 
         pdev->dev.platform_data = ep93xx_rtc;
 
@@ -151,53 +155,34 @@ static int __init ep93xx_rtc_probe(struct platform_device *pdev)
                                 &pdev->dev, &ep93xx_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc)) {
                 err = PTR_ERR(rtc);
-                goto fail;
+                goto exit;
         }
 
         platform_set_drvdata(pdev, rtc);
 
-        err = device_create_file(&pdev->dev, &dev_attr_comp_preload);
+        err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
         if (err)
                 goto fail;
-        err = device_create_file(&pdev->dev, &dev_attr_comp_delete);
-        if (err) {
-                device_remove_file(&pdev->dev, &dev_attr_comp_preload);
-                goto fail;
-        }
 
         return 0;
 
 fail:
-        if (ep93xx_rtc->mmio_base) {
-                iounmap(ep93xx_rtc->mmio_base);
-                pdev->dev.platform_data = NULL;
-        }
-        release_mem_region(res->start, resource_size(res));
-fail_free:
-        kfree(ep93xx_rtc);
+        platform_set_drvdata(pdev, NULL);
+        rtc_device_unregister(rtc);
+exit:
+        pdev->dev.platform_data = NULL;
         return err;
 }
 
 static int __exit ep93xx_rtc_remove(struct platform_device *pdev)
 {
         struct rtc_device *rtc = platform_get_drvdata(pdev);
-        struct ep93xx_rtc *ep93xx_rtc = pdev->dev.platform_data;
-        struct resource *res;
-
-        /* cleanup sysfs */
-        device_remove_file(&pdev->dev, &dev_attr_comp_delete);
-        device_remove_file(&pdev->dev, &dev_attr_comp_preload);
 
+        sysfs_remove_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
+        platform_set_drvdata(pdev, NULL);
         rtc_device_unregister(rtc);
-
-        iounmap(ep93xx_rtc->mmio_base);
         pdev->dev.platform_data = NULL;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, resource_size(res));
-
-        platform_set_drvdata(pdev, NULL);
-
         return 0;
 }
 
diff --git a/drivers/rtc/rtc-mc13783.c b/drivers/rtc/rtc-mc13783.c
index 850f983c039c..d60c81b7b693 100644
--- a/drivers/rtc/rtc-mc13783.c
+++ b/drivers/rtc/rtc-mc13783.c
@@ -28,6 +28,34 @@ struct mc13783_rtc {
         int valid;
 };
 
+static int mc13783_rtc_irq_enable_unlocked(struct device *dev,
+                unsigned int enabled, int irq)
+{
+        struct mc13783_rtc *priv = dev_get_drvdata(dev);
+        int (*func)(struct mc13783 *mc13783, int irq);
+
+        if (!priv->valid)
+                return -ENODATA;
+
+        func = enabled ? mc13783_irq_unmask : mc13783_irq_mask;
+        return func(priv->mc13783, irq);
+}
+
+static int mc13783_rtc_irq_enable(struct device *dev,
+                unsigned int enabled, int irq)
+{
+        struct mc13783_rtc *priv = dev_get_drvdata(dev);
+        int ret;
+
+        mc13783_lock(priv->mc13783);
+
+        ret = mc13783_rtc_irq_enable_unlocked(dev, enabled, irq);
+
+        mc13783_unlock(priv->mc13783);
+
+        return ret;
+}
+
 static int mc13783_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
         struct mc13783_rtc *priv = dev_get_drvdata(dev);
@@ -78,6 +106,7 @@ static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs)
 {
         struct mc13783_rtc *priv = dev_get_drvdata(dev);
         unsigned int seconds, days;
+        unsigned int alarmseconds;
         int ret;
 
         seconds = secs % 86400;
@@ -86,7 +115,22 @@ static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs)
         mc13783_lock(priv->mc13783);
 
         /*
-         * first write seconds=0 to prevent a day switch between writing days
+         * temporarily invalidate alarm to prevent triggering it when the day is
+         * already updated while the time isn't yet.
+         */
+        ret = mc13783_reg_read(priv->mc13783, MC13783_RTCTODA, &alarmseconds);
+        if (unlikely(ret))
+                goto out;
+
+        if (alarmseconds < 86400) {
+                ret = mc13783_reg_write(priv->mc13783,
+                                MC13783_RTCTODA, 0x1ffff);
+                if (unlikely(ret))
+                        goto out;
+        }
+
+        /*
+         * write seconds=0 to prevent a day switch between writing days
          * and seconds below
          */
         ret = mc13783_reg_write(priv->mc13783, MC13783_RTCTOD, 0);
@@ -101,11 +145,19 @@ static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs)
         if (unlikely(ret))
                 goto out;
 
-        ret = mc13783_ackirq(priv->mc13783, MC13783_IRQ_RTCRST);
+        /* restore alarm */
+        if (alarmseconds < 86400) {
+                ret = mc13783_reg_write(priv->mc13783,
+                                MC13783_RTCTODA, alarmseconds);
+                if (unlikely(ret))
+                        goto out;
+        }
+
+        ret = mc13783_irq_ack(priv->mc13783, MC13783_IRQ_RTCRST);
         if (unlikely(ret))
                 goto out;
 
-        ret = mc13783_unmask(priv->mc13783, MC13783_IRQ_RTCRST);
+        ret = mc13783_irq_unmask(priv->mc13783, MC13783_IRQ_RTCRST);
 out:
         priv->valid = !ret;
 
@@ -114,41 +166,139 @@ out:
         return ret;
 }
 
-static irqreturn_t mc13783_rtc_update_handler(int irq, void *dev)
+static int mc13783_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
 {
-        struct mc13783_rtc *priv = dev;
-        struct mc13783 *mc13783 = priv->mc13783;
+        struct mc13783_rtc *priv = dev_get_drvdata(dev);
+        unsigned seconds, days;
+        unsigned long s1970;
+        int enabled, pending;
+        int ret;
 
-        dev_dbg(&priv->rtc->dev, "1HZ\n");
+        mc13783_lock(priv->mc13783);
 
-        rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF);
+        ret = mc13783_reg_read(priv->mc13783, MC13783_RTCTODA, &seconds);
+        if (unlikely(ret))
+                goto out;
+        if (seconds >= 86400) {
+                ret = -ENODATA;
+                goto out;
+        }
+
+        ret = mc13783_reg_read(priv->mc13783, MC13783_RTCDAY, &days);
+        if (unlikely(ret))
+                goto out;
 
-        mc13783_ackirq(mc13783, irq);
+        ret = mc13783_irq_status(priv->mc13783, MC13783_IRQ_TODA,
+                        &enabled, &pending);
 
-        return IRQ_HANDLED;
+out:
+        mc13783_unlock(priv->mc13783);
+
+        if (ret)
+                return ret;
+
+        alarm->enabled = enabled;
+        alarm->pending = pending;
+
+        s1970 = days * 86400 + seconds;
+
+        rtc_time_to_tm(s1970, &alarm->time);
+        dev_dbg(dev, "%s: %lu\n", __func__, s1970);
+
+        return 0;
 }
 
-static int mc13783_rtc_update_irq_enable(struct device *dev,
-                unsigned int enabled)
+static int mc13783_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
 {
         struct mc13783_rtc *priv = dev_get_drvdata(dev);
-        int ret = -ENODATA;
+        unsigned long s1970;
+        unsigned seconds, days;
+        int ret;
 
         mc13783_lock(priv->mc13783);
-        if (!priv->valid)
+
+        /* disable alarm to prevent false triggering */
+        ret = mc13783_reg_write(priv->mc13783, MC13783_RTCTODA, 0x1ffff);
+        if (unlikely(ret))
                 goto out;
 
-        ret = (enabled ? mc13783_unmask : mc13783_mask)(priv->mc13783,
-                        MC13783_IRQ_1HZ);
+        ret = mc13783_irq_ack(priv->mc13783, MC13783_IRQ_TODA);
+        if (unlikely(ret))
+                goto out;
+
+        ret = rtc_tm_to_time(&alarm->time, &s1970);
+        if (unlikely(ret))
+                goto out;
+
+        dev_dbg(dev, "%s: o%2.s %lu\n", __func__, alarm->enabled ? "n" : "ff",
+                        s1970);
+
+        ret = mc13783_rtc_irq_enable_unlocked(dev, alarm->enabled,
+                        MC13783_IRQ_TODA);
+        if (unlikely(ret))
+                goto out;
+
+        seconds = s1970 % 86400;
+        days = s1970 / 86400;
+
+        ret = mc13783_reg_write(priv->mc13783, MC13783_RTCDAYA, days);
+        if (unlikely(ret))
+                goto out;
+
+        ret = mc13783_reg_write(priv->mc13783, MC13783_RTCTODA, seconds);
+
 out:
         mc13783_unlock(priv->mc13783);
 
         return ret;
 }
 
+static irqreturn_t mc13783_rtc_alarm_handler(int irq, void *dev)
+{
+        struct mc13783_rtc *priv = dev;
+        struct mc13783 *mc13783 = priv->mc13783;
+
+        dev_dbg(&priv->rtc->dev, "Alarm\n");
+
+        rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_AF);
+
+        mc13783_irq_ack(mc13783, irq);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t mc13783_rtc_update_handler(int irq, void *dev)
+{
+        struct mc13783_rtc *priv = dev;
+        struct mc13783 *mc13783 = priv->mc13783;
+
+        dev_dbg(&priv->rtc->dev, "1HZ\n");
+
+        rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF);
+
+        mc13783_irq_ack(mc13783, irq);
+
+        return IRQ_HANDLED;
+}
+
+static int mc13783_rtc_update_irq_enable(struct device *dev,
+                unsigned int enabled)
+{
+        return mc13783_rtc_irq_enable(dev, enabled, MC13783_IRQ_1HZ);
+}
+
+static int mc13783_rtc_alarm_irq_enable(struct device *dev,
+                unsigned int enabled)
+{
+        return mc13783_rtc_irq_enable(dev, enabled, MC13783_IRQ_TODA);
+}
+
 static const struct rtc_class_ops mc13783_rtc_ops = {
         .read_time = mc13783_rtc_read_time,
         .set_mmss = mc13783_rtc_set_mmss,
+        .read_alarm = mc13783_rtc_read_alarm,
+        .set_alarm = mc13783_rtc_set_alarm,
+        .alarm_irq_enable = mc13783_rtc_alarm_irq_enable,
         .update_irq_enable = mc13783_rtc_update_irq_enable,
 };
 
@@ -160,7 +310,7 @@ static irqreturn_t mc13783_rtc_reset_handler(int irq, void *dev)
         dev_dbg(&priv->rtc->dev, "RTCRST\n");
         priv->valid = 0;
 
-        mc13783_mask(mc13783, irq);
+        mc13783_irq_mask(mc13783, irq);
 
         return IRQ_HANDLED;
 }
@@ -169,6 +319,7 @@ static int __devinit mc13783_rtc_probe(struct platform_device *pdev)
 {
         int ret;
         struct mc13783_rtc *priv;
+        int rtcrst_pending;
 
         priv = kzalloc(sizeof(*priv), GFP_KERNEL);
         if (!priv)
@@ -177,8 +328,6 @@ static int __devinit mc13783_rtc_probe(struct platform_device *pdev)
         priv->mc13783 = dev_get_drvdata(pdev->dev.parent);
         platform_set_drvdata(pdev, priv);
 
-        priv->valid = 1;
-
         mc13783_lock(priv->mc13783);
 
         ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_RTCRST,
@@ -186,33 +335,45 @@ static int __devinit mc13783_rtc_probe(struct platform_device *pdev)
         if (ret)
                 goto err_reset_irq_request;
 
+        ret = mc13783_irq_status(priv->mc13783, MC13783_IRQ_RTCRST,
+                        NULL, &rtcrst_pending);
+        if (ret)
+                goto err_reset_irq_status;
+
+        priv->valid = !rtcrst_pending;
+
         ret = mc13783_irq_request_nounmask(priv->mc13783, MC13783_IRQ_1HZ,
                         mc13783_rtc_update_handler, DRIVER_NAME, priv);
         if (ret)
                 goto err_update_irq_request;
 
-        mc13783_unlock(priv->mc13783);
+        ret = mc13783_irq_request_nounmask(priv->mc13783, MC13783_IRQ_TODA,
+                        mc13783_rtc_alarm_handler, DRIVER_NAME, priv);
+        if (ret)
+                goto err_alarm_irq_request;
 
         priv->rtc = rtc_device_register(pdev->name,
                         &pdev->dev, &mc13783_rtc_ops, THIS_MODULE);
-
         if (IS_ERR(priv->rtc)) {
                 ret = PTR_ERR(priv->rtc);
 
-                mc13783_lock(priv->mc13783);
+                mc13783_irq_free(priv->mc13783, MC13783_IRQ_TODA, priv);
+err_alarm_irq_request:
 
                 mc13783_irq_free(priv->mc13783, MC13783_IRQ_1HZ, priv);
 err_update_irq_request:
 
+err_reset_irq_status:
+
                 mc13783_irq_free(priv->mc13783, MC13783_IRQ_RTCRST, priv);
 err_reset_irq_request:
 
-                mc13783_unlock(priv->mc13783);
-
                 platform_set_drvdata(pdev, NULL);
                 kfree(priv);
         }
 
+        mc13783_unlock(priv->mc13783);
+
         return ret;
 }
 
@@ -220,10 +381,11 @@ static int __devexit mc13783_rtc_remove(struct platform_device *pdev)
 {
         struct mc13783_rtc *priv = platform_get_drvdata(pdev);
 
-        rtc_device_unregister(priv->rtc);
-
         mc13783_lock(priv->mc13783);
 
+        rtc_device_unregister(priv->rtc);
+
+        mc13783_irq_free(priv->mc13783, MC13783_IRQ_TODA, priv);
         mc13783_irq_free(priv->mc13783, MC13783_IRQ_1HZ, priv);
         mc13783_irq_free(priv->mc13783, MC13783_IRQ_RTCRST, priv);
 
diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
index 6bd5072d4eb7..8710f9415d98 100644
--- a/drivers/rtc/rtc-mxc.c
+++ b/drivers/rtc/rtc-mxc.c
@@ -396,8 +396,11 @@ static int __init mxc_rtc_probe(struct platform_device *pdev)
         pdata->ioaddr = ioremap(res->start, resource_size(res));
 
         clk = clk_get(&pdev->dev, "ckil");
-        if (IS_ERR(clk))
-                return PTR_ERR(clk);
+        if (IS_ERR(clk)) {
+                iounmap(pdata->ioaddr);
+                ret = PTR_ERR(clk);
+                goto exit_free_pdata;
+        }
 
         rate = clk_get_rate(clk);
         clk_put(clk);
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
index e75df9d50e27..2ceb365533b2 100644
--- a/drivers/rtc/rtc-pcf2123.c
+++ b/drivers/rtc/rtc-pcf2123.c
@@ -315,7 +315,7 @@ kfree_exit:
         return ret;
 }
 
-static int pcf2123_remove(struct spi_device *spi)
+static int __devexit pcf2123_remove(struct spi_device *spi)
 {
         struct pcf2123_plat_data *pdata = spi->dev.platform_data;
         int i;
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index c6a83a2a722c..ed1b86828124 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -57,7 +57,7 @@ enum {
         REG_RTC_COMP_LSB_REG,
         REG_RTC_COMP_MSB_REG,
 };
-const static u8 twl4030_rtc_reg_map[] = {
+static const u8 twl4030_rtc_reg_map[] = {
         [REG_SECONDS_REG] = 0x00,
         [REG_MINUTES_REG] = 0x01,
         [REG_HOURS_REG] = 0x02,
@@ -80,7 +80,7 @@ const static u8 twl4030_rtc_reg_map[] = {
         [REG_RTC_COMP_LSB_REG] = 0x10,
         [REG_RTC_COMP_MSB_REG] = 0x11,
 };
-const static u8 twl6030_rtc_reg_map[] = {
+static const u8 twl6030_rtc_reg_map[] = {
         [REG_SECONDS_REG] = 0x00,
         [REG_MINUTES_REG] = 0x01,
         [REG_HOURS_REG] = 0x02,