Commit 0328b5f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "Many cleanups and a few drivers removal this cycle.

  Subsystem:
   - Introduce features bitfield and the first feature: RTC_FEATURE_ALARM

  Removed drivers:
   - ab3100
   - coh901331
   - tx4939
   - sirfsoc

  Drivers:
   - use rtc_lock and rtc_unlock instead of opencoding
   - constify all struct rtc_class_ops
   - quiet maybe-unused variable warning
   - replace spin_lock_irqsave with spin_lock in hard IRQ
   - pcf2127: disable Power-On Reset Override and run OTP refresh"

* tag 'rtc-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (81 commits)
  rtc: abx80x: Add utility function for writing configuration key
  rtc: pcf2127: properly set flag WD_CD for rtc chips(pcf2129, pca2129)
  rtc: pcf8563: Add NXP PCA8565 compatible
  rtc: s3c: quiet maybe-unused variable warning
  rtc: s3c: stop setting bogus time
  rtc: sd3078: quiet maybe-unused variable warning
  rtc: s35390a: quiet maybe-unused variable warning
  rtc: rx8581: quiet maybe-unused variable warning
  rtc: rx8010: quiet maybe-unused variable warning
  rtc: rv8803: quiet maybe-unused variable warning
  rtc: rv3032: quiet maybe-unused variable warning
  rtc: rv3029: quiet maybe-unused variable warning
  rtc: rv3028: quiet maybe-unused variable warning
  rtc: rs5c372: quiet maybe-unused variable warning
  rtc: pcf85363: quiet maybe-unused variable warning
  rtc: pcf85063: quiet maybe-unused variable warnings
  rtc: meson: quiet maybe-unused variable warning
  rtc: m41t80: quiet maybe-unused variable warning
  rtc: isl1208: quiet maybe-unused variable warning
  rtc: ds3232: quiet maybe-unused variable warning
  ...
parents 36c1b20d 49dfc1f1

Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
      - atmel,sama5d4-rtc

      - atmel,sama5d2-rtc

      - microchip,sam9x60-rtc

      - microchip,sama7g5-rtc



  reg:

    maxItems: 1

Documentation/devicetree/bindings/rtc/nxp,pcf2127.yaml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/rtc/nxp,pcf2127.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: NXP PCF2127 Real Time Clock



allOf:

  - $ref: "rtc.yaml#"



maintainers:

  - Alexandre Belloni <alexandre.belloni@bootlin.com>



properties:

  compatible:

    const: nxp,pcf2127



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  start-year: true



  reset-source: true



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        rtc@51 {

            compatible = "nxp,pcf2127";

            reg = <0x51>;

            pinctrl-0 = <&rtc_nint_pins>;

            interrupts-extended = <&gpio1 16 IRQ_TYPE_LEVEL_HIGH>;

            reset-source;

        };

    };



...

Documentation/devicetree/bindings/rtc/pcf8563.txt

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ Philips PCF8563/Epson RTC8564 Real Time Clock 
Required properties:

- compatible: Should contain "nxp,pcf8563",

	"epson,rtc8564" or

	"microcrystal,rv8564"

	"microcrystal,rv8564" or

	"nxp,pca8565"

- reg: I2C address for chip.



Optional property:

Documentation/devicetree/bindings/rtc/sirf,prima2-sysrtc.txt

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
SiRFSoC Real Time Clock



Required properties:

- compatible: must be "sirf,prima2-sysrtc"

- reg: address range of rtc register set.

- interrupts: rtc alarm interrupts.



Example:

	rtc@2000 {

		compatible = "sirf,prima2-sysrtc";

		reg = <0x2000 0x1000>;

		interrupts = <52 53 54>;

	};

Documentation/devicetree/bindings/rtc/stericsson,coh901331.txt

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
ST-Ericsson COH 901 331 Real Time Clock



Required properties:

- compatible: must be "stericsson,coh901331"

- reg: address range of rtc register set.

- interrupts: rtc alarm interrupt.

- clocks: phandle to the rtc clock source



Example:

	rtc: rtc@c0017000 {

		compatible = "stericsson,coh901331";

		reg = <0xc0017000 0x1000>;

		interrupt-parent = <&vicb>;

		interrupts = <10>;

		clocks = <&rtc_clk>;

	};