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
  ...

diff --cc Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
index 0af618b,0860346..27784b6
--- 1/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
--- 2/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
+++ b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
@@@ -147,10 -158,27 +153,14 @@@ firmware 
                        ...
                };
  
 -              imx8qx-pm {
 -                      compatible = "fsl,scu-pd";
 -                      #address-cells = <1>;
 -                      #size-cells = <0>;
 -
 -                      pd_dma: dma-power-domain {
 -                              #power-domain-cells = <0>;
 -
 -                              pd_dma_lpuart0: dma-lpuart0@57 {
 -                                      reg = <SC_R_UART_0>;
 -                                      #power-domain-cells = <0>;
 -                                      power-domains = <&pd_dma>;
 -                              };
 -                              ...
 -                      };
 -                      ...
 +              pd: imx8qx-pd {
 +                      compatible = "fsl,imx8qxp-scu-pd";
 +                      #power-domain-cells = <1>;
                };
+ 
+               rtc: rtc {
+                       compatible = "fsl,imx8qxp-sc-rtc";
+               };
        };
  };
  

diff --cc drivers/char/rtc.c
Simple merge

diff --cc drivers/rtc/hctosys.c
Simple merge