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

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

Pull RTC updates from Alexandre Belloni:
 "Most of the changes are a rework of the cmos driver by Rafael and
  fixes for issues found using static checkers. The removal of a driver
  leads to a reduction of the number of LOC of the subsystem.

  Removed driver:
   - davinci

  Updates:
   - convert i2c drivers to .probe_new
   - fix spelling mistakes and duplicated words in comments
   - cmos: rework wake setup and ACPI event handling
   - cros-ec: Limit RTC alarm range to fix alarmtimer
   - ds1347: fix century register handling
   - efi: wakeup support
   - isl12022: temperature sensor support
   - pcf85063: fix read_alarm and clkout
   - pcf8523: use stop bit to detect invalid time
   - pcf8563: use RTC_FEATURE_ALARM
   - snvs: be more flexible on LPSRT reads
   - many static checker fixes"

* tag 'rtc-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (48 commits)
  rtc: ds1742: use devm_platform_get_and_ioremap_resource()
  rtc: mxc_v2: Add missing clk_disable_unprepare()
  rtc: rs5c313: correct some spelling mistakes
  rtc: at91rm9200: Fix syntax errors in comments
  rtc: remove duplicated words in comments
  rtc: rv3028: Use IRQ flags obtained from device tree if available
  rtc: ds1307: use sysfs_emit() to instead of scnprintf()
  rtc: isl12026: drop obsolete dependency on COMPILE_TEST
  dt-bindings: rtc: m41t80: Convert text schema to YAML one
  rtc: pcf85063: fix pcf85063_clkout_control
  rtc: rx6110: fix warning with !OF
  rtc: rk808: reduce 'struct rk808' usage
  rtc: msc313: Fix function prototype mismatch in msc313_rtc_probe()
  dt-bindings: rtc: convert rtc-meson.txt to dt-schema
  rtc: pic32: Move devm_rtc_allocate_device earlier in pic32_rtc_probe()
  rtc: st-lpc: Add missing clk_disable_unprepare in st_rtc_probe()
  rtc: pcf85063: Fix reading alarm
  rtc: pcf8523: fix for stop bit
  rtc: efi: Add wakeup support
  rtc: pcf8563: clear RTC_FEATURE_ALARM if no irq
  ...
parents 9322af3e e88f319a

Documentation/devicetree/bindings/rtc/amlogic,meson6-rtc.yaml

0 → 100644
+62 −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/amlogic,meson6-rtc.yaml#

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



title: Amlogic Meson6, Meson8, Meson8b and Meson8m2 RTC



maintainers:

  - Neil Armstrong <neil.armstrong@linaro.org>

  - Martin Blumenstingl <martin.blumenstingl@googlemail.com>



allOf:

  - $ref: rtc.yaml#

  - $ref: /schemas/nvmem/nvmem.yaml#



properties:

  compatible:

    enum:

      - amlogic,meson6-rtc

      - amlogic,meson8-rtc

      - amlogic,meson8b-rtc

      - amlogic,meson8m2-rtc



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  interrupts:

    maxItems: 1



  resets:

    maxItems: 1



  vdd-supply: true



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

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

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

    rtc: rtc@740 {

        compatible = "amlogic,meson6-rtc";

        reg = <0x740 0x14>;

        interrupts = <GIC_SPI 72 IRQ_TYPE_EDGE_RISING>;

        clocks = <&rtc32k_xtal>;

        vdd-supply = <&rtc_vdd>;

        resets = <&reset_rtc>;

        #address-cells = <1>;

        #size-cells = <1>;



        mac@0 {

            reg = <0 6>;

        };

    };

Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
Haoyu Microelectronics HYM8563 Real Time Clock



The HYM8563 provides basic rtc and alarm functionality

as well as a clock output of up to 32kHz.



Required properties:

- compatible: should be: "haoyu,hym8563"

- reg: i2c address

- #clock-cells: the value should be 0



Optional properties:

- clock-output-names: From common clock binding

- interrupts: rtc alarm/event interrupt



Example:



hym8563: hym8563@51 {

	compatible = "haoyu,hym8563";

	reg = <0x51>;



	interrupts = <13 IRQ_TYPE_EDGE_FALLING>;



	#clock-cells = <0>;

};



device {

...

	clocks = <&hym8563>;

...

};

Documentation/devicetree/bindings/rtc/haoyu,hym8563.yaml

0 → 100644
+56 −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/haoyu,hym8563.yaml#

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



title: Haoyu Microelectronics HYM8563 RTC



maintainers:

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



properties:

  compatible:

    const: haoyu,hym8563



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  "#clock-cells":

    const: 0



  clock-output-names:

    description: From common clock binding to override the default output clock name.

    maxItems: 1



  wakeup-source:

    description: Enables wake up of host system on alarm.



allOf:

  - $ref: rtc.yaml



unevaluatedProperties: false



required:

  - compatible

  - reg

  - "#clock-cells"



examples:

  - |

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



    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        rtc@51 {

            compatible = "haoyu,hym8563";

            reg = <0x51>;

            interrupts = <13 IRQ_TYPE_EDGE_FALLING>;

            #clock-cells = <0>;

        };

    };

Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml

+10 −6
Original line number Diff line number Diff line
@@ -11,12 +11,16 @@ maintainers: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - qcom,pm8058-rtc

          - qcom,pm8921-rtc

          - qcom,pm8941-rtc

      - qcom,pm8018-rtc

          - qcom,pmk8350-rtc

      - items:

          - enum:

              - qcom,pm8018-rtc

          - const: qcom,pm8921-rtc



  reg:

    minItems: 1

Documentation/devicetree/bindings/rtc/rtc-m41t80.txt

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
ST M41T80 family of RTC and compatible



Required properties:

- compatible: should be one of:

	"st,m41t62",

	"st,m41t65",

	"st,m41t80",

	"st,m41t81",

	"st,m41t81s",

	"st,m41t82",

	"st,m41t83",

	"st,m41t84",

	"st,m41t85",

	"st,m41t87",

	"microcrystal,rv4162",

- reg: I2C bus address of the device



Optional properties:

- interrupts: rtc alarm interrupt.

- clock-output-names: From common clock binding to override the default output

                      clock name

- wakeup-source: Enables wake up of host system on alarm



Optional child node:

- clock: Provide this if the square wave pin is used as boot-enabled fixed clock.



Example:

	rtc@68 {

		compatible = "st,m41t80";

		reg = <0x68>;

		interrupt-parent = <&UIC0>;

		interrupts = <0x9 0x8>;



		clock {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <32768>;

		};

	};