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

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

Pull RTC updates from Alexandre Belloni:
 "Subsystem:

   - Add a way for drivers to tell the core the supported alarm range is
     smaller than the date range. This is not used yet but will be
     useful for the alarmtimers in the next release.

   - fix Wvoid-pointer-to-enum-cast warnings

   - remove redundant of_match_ptr()

   - stop warning for invalid alarms when the alarm is disabled

  Drivers:

   - isl12022: allow setting the trip level for battery level detection

   - pcf2127: add support for PCF2131 and multiple timestamps

   - stm32: time precision improvement, many fixes

   - twl: NVRAM support"

* tag 'rtc-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (73 commits)
  dt-bindings: rtc: ds3231: Remove text binding
  rtc: wm8350: remove unnecessary messages
  rtc: twl: remove unnecessary messages
  rtc: sun6i: remove unnecessary message
  rtc: stop warning for invalid alarms when the alarm is disabled
  rtc: twl: add NVRAM support
  rtc: pcf85363: Allow to wake up system without IRQ
  rtc: m48t86: add DT support for m48t86
  dt-bindings: rtc: Add ST M48T86
  rtc: pcf2127: remove useless check
  rtc: rzn1: Report maximum alarm limit to rtc core
  rtc: ds1305: Report maximum alarm limit to rtc core
  rtc: tps6586x: Report maximum alarm limit to rtc core
  rtc: cmos: Report supported alarm limit to rtc infrastructure
  rtc: cros-ec: Detect and report supported alarm window size
  rtc: Add support for limited alarm timer offsets
  rtc: isl1208: Fix incorrect logic in isl1208_set_xtoscb()
  MAINTAINERS: remove obsolete pattern in RTC SUBSYSTEM section
  rtc: tps65910: Remove redundant dev_warn() and do not check for 0 return after calling platform_get_irq()
  rtc: omap: Do not check for 0 return after calling platform_get_irq()
  ...
parents e59a698b ce413486

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

+11 −7
Original line number Diff line number Diff line
@@ -14,13 +14,17 @@ maintainers: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - atmel,at91rm9200-rtc

          - atmel,at91sam9x5-rtc

          - atmel,sama5d4-rtc

          - atmel,sama5d2-rtc

          - microchip,sam9x60-rtc

          - microchip,sama7g5-rtc

      - items:

          - const: microchip,sam9x7-rtc

          - const: microchip,sam9x60-rtc



  reg:

    maxItems: 1

Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml

0 → 100644
+64 −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/intersil,isl12022.yaml#

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



title: Intersil ISL12022 Real-time Clock



maintainers:

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



properties:

  compatible:

    const: isil,isl12022



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  '#clock-cells':

    const: 0



  isil,battery-trip-levels-microvolt:

    description:

      The battery voltages at which the first alarm and second alarm

      should trigger (normally ~85% and ~75% of nominal V_BAT).

    items:

      - enum: [2125000, 2295000, 2550000, 2805000, 3060000, 4250000, 4675000]

      - enum: [1875000, 2025000, 2250000, 2475000, 2700000, 3750000, 4125000]



required:

  - compatible

  - reg



allOf:

  - $ref: rtc.yaml#

  # If #clock-cells is present, interrupts must not be present

  - if:

      required:

        - '#clock-cells'

    then:

      properties:

        interrupts: false



unevaluatedProperties: false



examples:

  - |

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

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        rtc@6f {

            compatible = "isil,isl12022";

            reg = <0x6f>;

            interrupts-extended = <&gpio1 5 IRQ_TYPE_LEVEL_LOW>;

            isil,battery-trip-levels-microvolt = <2550000>, <2250000>;

        };

    };



...

Documentation/devicetree/bindings/rtc/maxim,ds3231.txt

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
* Maxim DS3231 Real Time Clock



Required properties:

- compatible: Should contain "maxim,ds3231".

- reg: I2C address for chip.



Optional property:

- #clock-cells: Should be 1.

- clock-output-names:

  overwrite the default clock names "ds3231_clk_sqw" and "ds3231_clk_32khz".



Each clock is assigned an identifier and client nodes can use this identifier

to specify the clock which they consume. Following indices are allowed:

    - 0: square-wave output on the SQW pin

    - 1: square-wave output on the 32kHz pin



- interrupts: rtc alarm/event interrupt. When this property is selected,

  clock on the SQW pin cannot be used.



Example:



ds3231: ds3231@51 {

	compatible = "maxim,ds3231";

	reg = <0x68>;

	#clock-cells = <1>;

};



device1 {

...

	clocks = <&ds3231 0>;

...

};



device2 {

...

	clocks = <&ds3231 1>;

...

};

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

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
      - nxp,pca2129

      - nxp,pcf2127

      - nxp,pcf2129

      - nxp,pcf2131



  reg:

    maxItems: 1

Documentation/devicetree/bindings/rtc/st,m48t86.yaml

0 → 100644
+38 −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/st,m48t86.yaml#

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



title: ST M48T86 / Dallas DS12887 RTC with SRAM



maintainers:

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



allOf:

  - $ref: rtc.yaml



properties:

  compatible:

    enum:

      - st,m48t86



  reg:

    items:

      - description: index register

      - description: data register



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    rtc@10800000 {

      compatible = "st,m48t86";

      reg = <0x10800000 0x1>, <0x11700000 0x1>;

    };



...