Merge tag 'rtc-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

Pull RTC updates from Alexandre Belloni:
 "A huge series from me this cycle. I went through many drivers to set
  the date and time range supported by the RTC which helps solving HW
  limitation when the time comes (as early as next year for some). This
  time, I focused on drivers using .set_mms and .set_mmss64, allowing me
  to remove those callbacks. About a third of the patches got reviews, I
  actually own the RTCs and I tested another third and the remaining one
  are unlikely to cause any issues.

  Other than that, a single new driver and the usual fixes here and there.

  Summary:

  Subsystem:

   - set_mmss and set_mmss64 rtc_ops removal

   - Fix timestamp value for RTC_TIMESTAMP_BEGIN_1900

   - Use SPDX identifier for the core

   - validate upper bound of tm->tm_year

  New driver:

   - Aspeed BMC SoC RTC

  Drivers:

   - abx80x: use rtc_add_group

   - ds3232: nvram support

   - pcf85063: add alarm, nvram, offset correction and microcrystal
     rv8263 support

   - x1205: add of_match_table

   - Use set_time instead of set_mms/set_mmss64 for: ab3100, coh901331,
     digicolor, ds1672, ds2404, ep93xx, imxdi, jz4740, lpc32xx, mc13xxx,
     mxc, pcap, stmp3xxx, test, wm831x, xgene.

   - Set RTC range for: ab3100, at91sam9, coh901331, da9063, digicolor,
     dm355evm, ds1672, ds2404, ep39xx, goldfish, imxdi, jz4740, lpc32xx,
     mc13xxx, mv, mxc, omap, pcap, pcf85063, pcf85363, ps3, sh,
     stmp3xxx, sun4v, tegra, wm831x, xgene.

   - Switch to rtc_time64_to_tm/rtc_tm_to_time64 for the driver that
     properly set the RTC range.

   - Use dev_get_drvdata instead of multiple indirections"

* tag 'rtc-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (177 commits)
  rtc: snvs: Use __maybe_unused instead of #if CONFIG_PM_SLEEP
  rtc: imxdi: remove unused variable
  rtc: drop set_mms and set_mmss64
  rtc: pcap: convert to SPDX identifier
  rtc: pcap: use .set_time
  rtc: pcap: switch to rtc_time64_to_tm/rtc_tm_to_time64
  rtc: pcap: set range
  rtc: digicolor: convert to SPDX identifier
  rtc: digicolor: use .set_time
  rtc: digicolor: set range
  rtc: digicolor: fix possible race condition
  rtc: jz4740: convert to SPDX identifier
  rtc: jz4740: rework invalid time detection
  rtc: jz4740: use dev_pm_set_wake_irq() to simplify code
  rtc: jz4740: use .set_time
  rtc: jz4740: remove useless check
  rtc: jz4740: switch to rtc_time64_to_tm/rtc_tm_to_time64
  rtc: jz4740: set range
  rtc: 88pm860x: prevent use-after-free on device remove
  rtc: Use dev_get_drvdata()
  ...

1 files changed, 16 insertions, 34 deletions

diff --git a/drivers/rtc/rtc-goldfish.c b/drivers/rtc/rtc-goldfish.c
index a1c44d0c8557..1a3420ee6a4d 100644
--- a/drivers/rtc/rtc-goldfish.c
+++ b/drivers/rtc/rtc-goldfish.c
@@ -1,23 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
 /* drivers/rtc/rtc-goldfish.c
  *
  * Copyright (C) 2007 Google, Inc.
  * Copyright (C) 2017 Imagination Technologies Ltd.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 
+#include <linux/io.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
-#include <linux/io.h>
 
 #define TIMER_TIME_LOW          0x00    /* get low bits of current time  */
                                         /*   and update TIMER_TIME_HIGH  */
@@ -56,7 +48,7 @@ static int goldfish_rtc_read_alarm(struct device *dev,
         do_div(rtc_alarm, NSEC_PER_SEC);
         memset(alrm, 0, sizeof(struct rtc_wkalrm));
 
-        rtc_time_to_tm(rtc_alarm, &alrm->time);
+        rtc_time64_to_tm(rtc_alarm, &alrm->time);
 
         if (readl(base + TIMER_ALARM_STATUS))
                 alrm->enabled = 1;
@@ -70,21 +62,15 @@ static int goldfish_rtc_set_alarm(struct device *dev,
                                   struct rtc_wkalrm *alrm)
 {
         struct goldfish_rtc *rtcdrv;
-        unsigned long rtc_alarm;
         u64 rtc_alarm64;
         u64 rtc_status_reg;
         void __iomem *base;
-        int ret = 0;
 
         rtcdrv = dev_get_drvdata(dev);
         base = rtcdrv->base;
 
         if (alrm->enabled) {
-                ret = rtc_tm_to_time(&alrm->time, &rtc_alarm);
-                if (ret != 0)
-                        return ret;
-
-                rtc_alarm64 = rtc_alarm * NSEC_PER_SEC;
+                rtc_alarm64 = rtc_tm_to_time64(&alrm->time) * NSEC_PER_SEC;
                 writel((rtc_alarm64 >> 32), base + TIMER_ALARM_HIGH);
                 writel(rtc_alarm64, base + TIMER_ALARM_LOW);
         } else {
@@ -98,7 +84,7 @@ static int goldfish_rtc_set_alarm(struct device *dev,
                         writel(1, base + TIMER_CLEAR_ALARM);
         }
 
-        return ret;
+        return 0;
 }
 
 static int goldfish_rtc_alarm_irq_enable(struct device *dev,
@@ -147,7 +133,7 @@ static int goldfish_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
         do_div(time, NSEC_PER_SEC);
 
-        rtc_time_to_tm(time, tm);
+        rtc_time64_to_tm(time, tm);
 
         return 0;
 }
@@ -156,21 +142,16 @@ static int goldfish_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
         struct goldfish_rtc *rtcdrv;
         void __iomem *base;
-        unsigned long now;
         u64 now64;
-        int ret;
 
         rtcdrv = dev_get_drvdata(dev);
         base = rtcdrv->base;
 
-        ret = rtc_tm_to_time(tm, &now);
-        if (ret == 0) {
-                now64 = now * NSEC_PER_SEC;
-                writel((now64 >> 32), base + TIMER_TIME_HIGH);
-                writel(now64, base + TIMER_TIME_LOW);
-        }
+        now64 = rtc_tm_to_time64(tm) * NSEC_PER_SEC;
+        writel((now64 >> 32), base + TIMER_TIME_HIGH);
+        writel(now64, base + TIMER_TIME_LOW);
 
-        return ret;
+        return 0;
 }
 
 static const struct rtc_class_ops goldfish_rtc_ops = {
@@ -205,19 +186,20 @@ static int goldfish_rtc_probe(struct platform_device *pdev)
         if (rtcdrv->irq < 0)
                 return -ENODEV;
 
-        rtcdrv->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
-                                               &goldfish_rtc_ops,
-                                               THIS_MODULE);
+        rtcdrv->rtc = devm_rtc_allocate_device(&pdev->dev);
         if (IS_ERR(rtcdrv->rtc))
                 return PTR_ERR(rtcdrv->rtc);
 
+        rtcdrv->rtc->ops = &goldfish_rtc_ops;
+        rtcdrv->rtc->range_max = U64_MAX / NSEC_PER_SEC;
+
         err = devm_request_irq(&pdev->dev, rtcdrv->irq,
                                goldfish_rtc_interrupt,
                                0, pdev->name, rtcdrv);
         if (err)
                 return err;
 
-        return 0;
+        return rtc_register_device(rtcdrv->rtc);
 }
 
 static const struct of_device_id goldfish_rtc_of_match[] = {