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

Pull RTC updates from Alexandre Belloni:
 "Subsystem:
   - new %ptR printk format
   - rename core files
   - allow registration of multiple nvmem devices

  New driver:
   - i.MX system controller RTC

  Driver updates:
   - abx80x: handle voltage ioctls, correct binding doc
   - m41t80: correct month in alarm reads
   - pcf85363: add pcf85263 support
   - pcf8523: properly handle battery low flag
   - s3c: limit alarm to one year in the future as ALMYEAR is broken
   - sun6i: rework clock output binding"

* tag 'rtc-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (54 commits)
  rtc: rename core files
  rtc: nvmem: fix possible use after free
  rtc: add i.MX system controller RTC support
  dt-bindings: fsl: scu: add rtc binding
  rtc: pcf2123: Add Microcrystal rv2123
  rtc: class: reimplement devm_rtc_device_register
  rtc: enforce rtc_timer_init private_data type
  rtc: abx80x: Implement RTC_VL_READ,CLR ioctls
  rtc: pcf85363: Add support for NXP pcf85263 rtc
  dt-bindings: rtc: pcf85363: Document pcf85263 real-time clock
  rtc: pcf8523: don't return invalid date when battery is low
  dt-bindings: rtc: use a generic node name for ds1307
  PM: Switch to use %ptR
  m68k/mac: Switch to use %ptR
  Input: hp_sdc_rtc - Switch to use %ptR
  rtc: tegra: Switch to use %ptR
  rtc: s5m: Switch to use %ptR
  rtc: s3c: Switch to use %ptR
  rtc: rx8025: Switch to use %ptR
  rtc: rx6110: Switch to use %ptR
  ...

1 files changed, 6 insertions, 12 deletions

diff --git a/drivers/rtc/rtc-mcp795.c b/drivers/rtc/rtc-mcp795.c
index 00e11c1b2186..f22a945a3794 100644
--- a/drivers/rtc/rtc-mcp795.c
+++ b/drivers/rtc/rtc-mcp795.c
@@ -233,9 +233,7 @@ static int mcp795_set_time(struct device *dev, struct rtc_time *tim)
         if (ret)
                 return ret;
 
-        dev_dbg(dev, "Set mcp795: %04d-%02d-%02d(%d) %02d:%02d:%02d\n",
-                        tim->tm_year + 1900, tim->tm_mon, tim->tm_mday,
-                        tim->tm_wday, tim->tm_hour, tim->tm_min, tim->tm_sec);
+        dev_dbg(dev, "Set mcp795: %ptR\n", tim);
 
         return 0;
 }
@@ -258,9 +256,7 @@ static int mcp795_read_time(struct device *dev, struct rtc_time *tim)
         tim->tm_mon     = bcd2bin(data[5] & 0x1F) - 1;
         tim->tm_year    = bcd2bin(data[6]) + 100; /* Assume we are in 20xx */
 
-        dev_dbg(dev, "Read from mcp795: %04d-%02d-%02d(%d) %02d:%02d:%02d\n",
-                        tim->tm_year + 1900, tim->tm_mon, tim->tm_mday,
-                        tim->tm_wday, tim->tm_hour, tim->tm_min, tim->tm_sec);
+        dev_dbg(dev, "Read from mcp795: %ptR\n", tim);
 
         return 0;
 }
@@ -319,9 +315,8 @@ static int mcp795_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
                         return ret;
                 dev_dbg(dev, "Alarm IRQ armed\n");
         }
-        dev_dbg(dev, "Set alarm: %02d-%02d(%d) %02d:%02d:%02d\n",
-                        alm->time.tm_mon, alm->time.tm_mday, alm->time.tm_wday,
-                        alm->time.tm_hour, alm->time.tm_min, alm->time.tm_sec);
+        dev_dbg(dev, "Set alarm: %ptRdr(%d) %ptRt\n",
+                &alm->time, alm->time.tm_wday, &alm->time);
         return 0;
 }
 
@@ -345,9 +340,8 @@ static int mcp795_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
         alm->time.tm_isdst      = -1;
         alm->time.tm_yday       = -1;
 
-        dev_dbg(dev, "Read alarm: %02d-%02d(%d) %02d:%02d:%02d\n",
-                        alm->time.tm_mon, alm->time.tm_mday, alm->time.tm_wday,
-                        alm->time.tm_hour, alm->time.tm_min, alm->time.tm_sec);
+        dev_dbg(dev, "Read alarm: %ptRdr(%d) %ptRt\n",
+                &alm->time, alm->time.tm_wday, &alm->time);
         return 0;
 }