Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28e8c4bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents c9bef4a6 36e14f5f

Documentation/core-api/printk-formats.rst

+18 −0
Original line number Diff line number Diff line
@@ -412,6 +412,24 @@ Examples:: 


Passed by reference.



Time and date (struct rtc_time)

-------------------------------



::



	%ptR		YYYY-mm-ddTHH:MM:SS

	%ptRd		YYYY-mm-dd

	%ptRt		HH:MM:SS

	%ptR[dt][r]



For printing date and time as represented by struct rtc_time structure in

human readable format.



By default year will be incremented by 1900 and month by 1. Use %ptRr (raw)

to suppress this behaviour.



Passed by reference.



struct clk

----------

Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt

+10 −0
Original line number Diff line number Diff line
@@ -109,6 +109,12 @@ Required properties for Pinctrl sub nodes: 
[2] Documentation/devicetree/bindings/power/power_domain.txt

[3] Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt



RTC bindings based on SCU Message Protocol

------------------------------------------------------------



Required properties:

- compatible: should be "fsl,imx8qxp-sc-rtc";



Example (imx8qxp):

-------------

lsio_mu1: mailbox@5d1c0000 {
@@ -151,6 +157,10 @@ firmware { 
			compatible = "fsl,imx8qxp-scu-pd";

			#power-domain-cells = <1>;

		};



		rtc: rtc {

			compatible = "fsl,imx8qxp-sc-rtc";

		};

	};

};

Documentation/devicetree/bindings/rtc/abracon,abx80x.txt

+1 −1
Original line number Diff line number Diff line
@@ -27,4 +27,4 @@ and valid to enable charging: 


 - "abracon,tc-diode": should be "standard" (0.6V) or "schottky" (0.3V)

 - "abracon,tc-resistor": should be <0>, <3>, <6> or <11>. 0 disables the output

                          resistor, the other values are in ohm.
 
                          resistor, the other values are in kOhm.

Documentation/devicetree/bindings/rtc/nxp,rtc-2123.txt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ NXP PCF2123 SPI Real Time Clock 


Required properties:

- compatible: should be: "nxp,rtc-pcf2123"

                      or "microcrystal,rv2123"

- reg: should be the SPI slave chipselect address



Optional properties:

Documentation/devicetree/bindings/rtc/pcf85363.txt

+2 −2
Original line number Diff line number Diff line 
NXP PCF85363 Real Time Clock

NXP PCF85263/PCF85363 Real Time Clock

============================



Required properties:

- compatible: Should contain "nxp,pcf85363".

- compatible: Should contain "nxp,pcf85263" or "nxp,pcf85363".

- reg: I2C address for chip.



Optional properties: