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, 36 insertions, 72 deletions

diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index 1d31c0ae6334..4daf3789b978 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * "RTT as Real Time Clock" driver for AT91SAM9 SoC family
  *
  * (C) 2007 Michel Benoit
  *
  * Based on rtc-at91rm9200.c by Rick Bronson
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
  */
 
 #include <linux/clk.h>
@@ -47,21 +43,21 @@
  * registers available, likewise usable for more than "RTC" support.
  */
 
-#define AT91_RTT_MR             0x00                    /* Real-time Mode Register */
-#define AT91_RTT_RTPRES         (0xffff << 0)           /* Real-time Timer Prescaler Value */
-#define AT91_RTT_ALMIEN         (1 << 16)               /* Alarm Interrupt Enable */
-#define AT91_RTT_RTTINCIEN      (1 << 17)               /* Real Time Timer Increment Interrupt Enable */
-#define AT91_RTT_RTTRST         (1 << 18)               /* Real Time Timer Restart */
+#define AT91_RTT_MR             0x00            /* Real-time Mode Register */
+#define AT91_RTT_RTPRES         (0xffff << 0)   /* Timer Prescaler Value */
+#define AT91_RTT_ALMIEN         BIT(16)         /* Alarm Interrupt Enable */
+#define AT91_RTT_RTTINCIEN      BIT(17)         /* Increment Interrupt Enable */
+#define AT91_RTT_RTTRST         BIT(18)         /* Timer Restart */
 
-#define AT91_RTT_AR             0x04                    /* Real-time Alarm Register */
-#define AT91_RTT_ALMV           (0xffffffff)            /* Alarm Value */
+#define AT91_RTT_AR             0x04            /* Real-time Alarm Register */
+#define AT91_RTT_ALMV           (0xffffffff)    /* Alarm Value */
 
-#define AT91_RTT_VR             0x08                    /* Real-time Value Register */
-#define AT91_RTT_CRTV           (0xffffffff)            /* Current Real-time Value */
+#define AT91_RTT_VR             0x08            /* Real-time Value Register */
+#define AT91_RTT_CRTV           (0xffffffff)    /* Current Real-time Value */
 
-#define AT91_RTT_SR             0x0c                    /* Real-time Status Register */
-#define AT91_RTT_ALMS           (1 << 0)                /* Real-time Alarm Status */
-#define AT91_RTT_RTTINC         (1 << 1)                /* Real-time Timer Increment */
+#define AT91_RTT_SR             0x0c            /* Real-time Status Register */
+#define AT91_RTT_ALMS           BIT(0)          /* Alarm Status */
+#define AT91_RTT_RTTINC         BIT(1)          /* Timer Increment */
 
 /*
  * We store ALARM_DISABLED in ALMV to record that no alarm is set.
@@ -69,14 +65,13 @@
  */
 #define ALARM_DISABLED  ((u32)~0)
 
-
 struct sam9_rtc {
         void __iomem            *rtt;
         struct rtc_device       *rtcdev;
         u32                     imr;
         struct regmap           *gpbr;
         unsigned int            gpbr_offset;
-        int                     irq;
+        int                     irq;
         struct clk              *sclk;
         bool                    suspended;
         unsigned long           events;
@@ -122,7 +117,7 @@ static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm)
         if (secs != secs2)
                 secs = rtt_readl(rtc, VR);
 
-        rtc_time_to_tm(offset + secs, tm);
+        rtc_time64_to_tm(offset + secs, tm);
 
         dev_dbg(dev, "%s: %ptR\n", __func__, tm);
 
@@ -135,15 +130,12 @@ static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm)
 static int at91_rtc_settime(struct device *dev, struct rtc_time *tm)
 {
         struct sam9_rtc *rtc = dev_get_drvdata(dev);
-        int err;
         u32 offset, alarm, mr;
         unsigned long secs;
 
         dev_dbg(dev, "%s: %ptR\n", __func__, tm);
 
-        err = rtc_tm_to_time(tm, &secs);
-        if (err != 0)
-                return err;
+        secs = rtc_tm_to_time64(tm);
 
         mr = rtt_readl(rtc, MR);
 
@@ -193,7 +185,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
 
         memset(alrm, 0, sizeof(*alrm));
         if (alarm != ALARM_DISABLED && offset != 0) {
-                rtc_time_to_tm(offset + alarm, tm);
+                rtc_time64_to_tm(offset + alarm, tm);
 
                 dev_dbg(dev, "%s: %ptR\n", __func__, tm);
 
@@ -211,11 +203,8 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
         unsigned long secs;
         u32 offset;
         u32 mr;
-        int err;
 
-        err = rtc_tm_to_time(tm, &secs);
-        if (err != 0)
-                return err;
+        secs = rtc_tm_to_time64(tm);
 
         offset = gpbr_readl(rtc);
         if (offset == 0) {
@@ -263,7 +252,7 @@ static int at91_rtc_proc(struct device *dev, struct seq_file *seq)
         u32 mr = rtt_readl(rtc, MR);
 
         seq_printf(seq, "update_IRQ\t: %s\n",
-                        (mr & AT91_RTT_RTTINCIEN) ? "yes" : "no");
+                   (mr & AT91_RTT_RTTINCIEN) ? "yes" : "no");
         return 0;
 }
 
@@ -299,7 +288,7 @@ static void at91_rtc_flush_events(struct sam9_rtc *rtc)
         rtc->events = 0;
 
         pr_debug("%s: num=%ld, events=0x%02lx\n", __func__,
-                rtc->events >> 8, rtc->events & 0x000000FF);
+                 rtc->events >> 8, rtc->events & 0x000000FF);
 }
 
 /*
@@ -340,13 +329,6 @@ static const struct rtc_class_ops at91_rtc_ops = {
         .alarm_irq_enable = at91_rtc_alarm_irq_enable,
 };
 
-static const struct regmap_config gpbr_regmap_config = {
-        .name = "gpbr",
-        .reg_bits = 32,
-        .val_bits = 32,
-        .reg_stride = 4,
-};
-
 /*
  * Initialize and install RTC driver
  */
@@ -357,6 +339,7 @@ static int at91_rtc_probe(struct platform_device *pdev)
         int             ret, irq;
         u32             mr;
         unsigned int    sclk_rate;
+        struct of_phandle_args args;
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
@@ -382,34 +365,14 @@ static int at91_rtc_probe(struct platform_device *pdev)
         if (IS_ERR(rtc->rtt))
                 return PTR_ERR(rtc->rtt);
 
-        if (!pdev->dev.of_node) {
-                /*
-                 * TODO: Remove this code chunk when removing non DT board
-                 * support. Remember to remove the gpbr_regmap_config
-                 * variable too.
-                 */
-                void __iomem *gpbr;
-
-                r = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-                gpbr = devm_ioremap_resource(&pdev->dev, r);
-                if (IS_ERR(gpbr))
-                        return PTR_ERR(gpbr);
-
-                rtc->gpbr = regmap_init_mmio(NULL, gpbr,
-                                             &gpbr_regmap_config);
-        } else {
-                struct of_phandle_args args;
-
-                ret = of_parse_phandle_with_fixed_args(pdev->dev.of_node,
-                                                "atmel,rtt-rtc-time-reg", 1, 0,
-                                                &args);
-                if (ret)
-                        return ret;
-
-                rtc->gpbr = syscon_node_to_regmap(args.np);
-                rtc->gpbr_offset = args.args[0];
-        }
+        ret = of_parse_phandle_with_fixed_args(pdev->dev.of_node,
+                                               "atmel,rtt-rtc-time-reg", 1, 0,
+                                               &args);
+        if (ret)
+                return ret;
 
+        rtc->gpbr = syscon_node_to_regmap(args.np);
+        rtc->gpbr_offset = args.args[0];
         if (IS_ERR(rtc->gpbr)) {
                 dev_err(&pdev->dev, "failed to retrieve gpbr regmap, aborting.\n");
                 return -ENOMEM;
@@ -444,13 +407,15 @@ static int at91_rtc_probe(struct platform_device *pdev)
         mr &= ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN);
         rtt_writel(rtc, MR, mr);
 
-        rtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name,
-                                        &at91_rtc_ops, THIS_MODULE);
+        rtc->rtcdev = devm_rtc_allocate_device(&pdev->dev);
         if (IS_ERR(rtc->rtcdev)) {
                 ret = PTR_ERR(rtc->rtcdev);
                 goto err_clk;
         }
 
+        rtc->rtcdev->ops = &at91_rtc_ops;
+        rtc->rtcdev->range_max = U32_MAX;
+
         /* register irq handler after we know what name we'll use */
         ret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt,
                                IRQF_SHARED | IRQF_COND_SUSPEND,
@@ -468,9 +433,9 @@ static int at91_rtc_probe(struct platform_device *pdev)
 
         if (gpbr_readl(rtc) == 0)
                 dev_warn(&pdev->dev, "%s: SET TIME!\n",
-                                dev_name(&rtc->rtcdev->dev));
+                         dev_name(&rtc->rtcdev->dev));
 
-        return 0;
+        return rtc_register_device(rtc->rtcdev);
 
 err_clk:
         clk_disable_unprepare(rtc->sclk);
@@ -528,8 +493,9 @@ static int at91_rtc_suspend(struct device *dev)
                         /* don't let RTTINC cause wakeups */
                         if (mr & AT91_RTT_RTTINCIEN)
                                 rtt_writel(rtc, MR, mr & ~AT91_RTT_RTTINCIEN);
-                } else
+                } else {
                         rtt_writel(rtc, MR, mr & ~rtc->imr);
+                }
         }
 
         return 0;
@@ -561,13 +527,11 @@ static int at91_rtc_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(at91_rtc_pm_ops, at91_rtc_suspend, at91_rtc_resume);
 
-#ifdef CONFIG_OF
 static const struct of_device_id at91_rtc_dt_ids[] = {
         { .compatible = "atmel,at91sam9260-rtt" },
         { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, at91_rtc_dt_ids);
-#endif
 
 static struct platform_driver at91_rtc_driver = {
         .probe          = at91_rtc_probe,