Commit f8d35403 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "There is an unusual amount of new drivers this cycle, and this
  explains the number of insertions.

  Other than that, the changes are the usual fixes and feature addition.

  Subsystem updates:
   - new quartz-load-femtofarads DT property for quartz load capacitance
   - remove rtc_class_ops.read_callback

  New drivers:
   - Abracon AB-RTCMC-32.768kHz-EOZ9
   - Amlogic Meson RTC
   - Cadence RTC IP
   - Microcrystal RV3028
   - Whwave sd3078

  Driver updates:
   - cmos: ignore bogus century byte
   - ds1307: rework rx8130 support
   - isl1208: add isl1209 support, nvmem support
   - rs5C372: report invalid time when the oscillator stopped
   - rx8581: add rx8571 support"

* tag 'rtc-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (66 commits)
  rtc: pic32: convert to SPDX identifier
  rtc: pic32: let the core handle range
  rtc: pic32: convert to devm_rtc_allocate_device
  rtc: update my email address
  rtc: rv8803: convert to SPDX identifier
  rtc: rv8803: let the core handle range
  rtc: tx4939: convert to SPDX identifier
  rtc: tx4939: use .set_time
  rtc: tx4939: switch to rtc_time64_to_tm/rtc_tm_to_time64
  rtc: tx4939: set range
  rtc: tx4939: remove useless test
  rtc: zynqmp: let the core handle range
  rtc: zynqmp: fix possible race condition
  rtc: imx-sc: use rtc_time64_to_tm
  rtc: rx8581: Add support for Epson rx8571 RTC
  dt-bindings: rtc: add rx8571 compatible
  rtc: pcf85063: remove dead code
  rtc: remove rtc_class_ops.read_callback
  rtc: add AB-RTCMC-32.768kHz-EOZ9 RTC support
  dt-bindings: rtc: add ABEOZ9
  ...
parents 9f24a81e e91b94fd

Documentation/devicetree/bindings/property-units.txt

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ Electricity 
-microwatt-hours: micro Watt-hours

-microvolt	: micro volts

-picofarads	: picofarads

-femtofarads	: femtofarads



Temperature

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

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

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ Required properties: 
        "abracon,ab1803"

        "abracon,ab1804"

        "abracon,ab1805"

        "microcrystal,rv1805"

	Using "abracon,abx80x" will enable chip autodetection.

 - "reg": I2C bus address of the device

Documentation/devicetree/bindings/rtc/cdns,rtc.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
Cadence Real Time Clock



The Cadence RTC controller with date, time and alarm capabilities.

The alarm may wake the system from low-power state.



Required properties:

- compatible: Should be "cdns,rtc-r109v3"

- reg: Specifies base physical address and size of the register area.

- interrupts: A single interrupt specifier.

- clocks: Must contain two entries:

	- pclk: APB registers clock

	- ref_clk: reference 1Hz or 100Hz clock, depending on IP configuration

	See ../clocks/clock-bindings.txt for details.



Example:

        rtc0: rtc@fd080000 {

        	compatible = "cdns,rtc-r109v3";

        	reg = <0xfd080000 0x1000>;



        	clock-names = "pclk", "ref_clk";

        	clocks = <&sysclock>, <&refclock>;



        	interrupt-parent = <&gic>;

        	interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;

        };

Documentation/devicetree/bindings/rtc/isil,isl1219.txt→Documentation/devicetree/bindings/rtc/isil,isl1208.txt

+38 −0
Original line number Diff line number Diff line 
Intersil ISL1219 I2C RTC/Alarm chip with event in

Intersil ISL1209/19 I2C RTC/Alarm chip with event in



ISL1219 has additional pins EVIN and #EVDET for tamper detection.

ISL12X9 have additional pins EVIN and #EVDET for tamper detection, while the

ISL1208 and ISL1218 do not.  They are all use the same driver with the bindings

described here, with chip specific properties as noted.



Required properties supported by the device:



 - "compatible": must be "isil,isl1219"

 - "compatible": Should be one of the following:

		- "isil,isl1208"

		- "isil,isl1209"

		- "isil,isl1218"

		- "isil,isl1219"

 - "reg": I2C bus address of the device



Optional properties:



 - "interrupt-names": list which may contains "irq" and "evdet"

	evdet applies to isl1209 and isl1219 only

 - "interrupts": list of interrupts for "irq" and "evdet"

 - "isil,ev-evienb": if present EV.EVIENB bit is set to the specified

                     value for proper operation.





Example isl1219 node with #IRQ pin connected to SoC gpio1 pin12

 and #EVDET pin connected to SoC gpio2 pin 24:

	evdet applies to isl1209 and isl1219 only

 - "isil,ev-evienb": Enable or disable internal pull on EVIN pin

	Applies to isl1209 and isl1219 only

	Possible values are 0 and 1

	Value 0 enables internal pull-up on evin pin, 1 disables it.

	Default will leave the non-volatile configuration of the pullup

	as is.



Example isl1219 node with #IRQ pin connected to SoC gpio1 pin12 and #EVDET pin

connected to SoC gpio2 pin 24 and internal pull-up enabled in EVIN pin.



	isl1219: rtc@68 {

		compatible = "isil,isl1219";

Documentation/devicetree/bindings/rtc/nxp,pcf85063.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
* NXP PCF85063 Real Time Clock



Required properties:

- compatible: Should contain "nxp,pcf85063".

- reg: I2C address for chip.



Optional property:

- quartz-load-femtofarads: The capacitive load of the quartz(x-tal),

  expressed in femto Farad (fF). Valid values are 7000 and 12500.

  Default value (if no value is specified) is 7000fF.



Example:



pcf85063: rtc@51 {

	compatible = "nxp,pcf85063";

	reg = <0x51>;

	quartz-load-femtofarads = <12500>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE