Commit 3d076fec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "New drivers:
   - Microchip PolarFire
   - Nuvoton NCT3018Y
   - TI K3 RTC

  Subsystem:
   - Replace flush_scheduled_work() with flush_work()
   - Remove deprecated ida_simple_get()/ida_simple_remove() calls

  Drivers:
   - use simple i2c probe where possible
   - sun6i: add R329 support
   - zynqmp: add calibration support
   - vr41xx: remove unused driver"

* tag 'rtc-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (31 commits)
  rtc: spear: set range max
  rtc: rtc-cmos: Do not check ACPI_FADT_LOW_POWER_S0
  rtc: zynqmp: initialize fract_tick
  rtc: Add NCT3018Y real time clock driver
  dt-bindings: rtc: nuvoton: add NCT3018Y Real Time Clock
  dt-bindings: rtc: nxp,pcf85063: Convert to DT schema
  dt-bindings: rtc: microcrystal,rv3032: Add missing type to 'trickle-voltage-millivolt'
  rtc: rx8025: fix 12/24 hour mode detection on RX-8035
  rtc: cros-ec: Only warn once in .remove() about notifier_chain problems
  rtc: vr41xx: remove driver
  rtc: mpfs: remove 'pending' variable from mpfs_rtc_wakeup_irq_handler()
  rtc: rv8803: fix missing unlock on error in rv8803_set_time()
  rtc: zynqmp: Add calibration set and get support
  rtc: zynqmp: Updated calibration value
  dt-bindings: rtc: zynqmp: Add clock information
  rtc: sun6i: add support for R329 RTC
  rtc: Directly use ida_alloc()/free()
  rtc: Introduce ti-k3-rtc
  dt-bindings: rtc: Add TI K3 RTC description
  dt-bindings: rtc: qcom-pm8xxx-rtc: Update the maintainers section
  ...
parents 4a935059 03c4cd6f

Documentation/devicetree/bindings/rtc/microcrystal,rv3032.yaml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ properties: 
      - 11000



  trickle-voltage-millivolt:

    $ref: /schemas/types.yaml#/definitions/uint32

    enum:

      - 1750

      - 3000

Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml

0 → 100644
+45 −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/nuvoton,nct3018y.yaml#

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



title: NUVOTON NCT3018Y Real Time Clock



allOf:

  - $ref: "rtc.yaml#"



maintainers:

  - Medad CChien <ctcchien@nuvoton.com>

  - Mia Lin <mimi05633@gmail.com>



properties:

  compatible:

    const: nuvoton,nct3018y



  reg:

    maxItems: 1



  start-year: true



  reset-source: true



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        rtc@6f {

            compatible = "nuvoton,nct3018y";

            reg = <0x6f>;

        };

    };



...

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

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
* NXP PCF85063 Real Time Clock



Required properties:

- compatible: Should one of contain:

	"nxp,pca85073a",

	"nxp,pcf85063",

	"nxp,pcf85063a",

	"nxp,pcf85063tp",

	"microcrystal,rv8263"

- 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.



Optional child node:

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



Example:



pcf85063: rtc@51 {

	compatible = "nxp,pcf85063";

	reg = <0x51>;

	quartz-load-femtofarads = <12500>;



		clock {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <32768>;

		};

};

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

0 → 100644
+92 −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,pcf85063.yaml#

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



title: NXP PCF85063 Real Time Clock



maintainers:

  - Alexander Stein <alexander.stein@ew.tq-group.com>



properties:

  compatible:

    enum:

      - microcrystal,rv8263

      - nxp,pcf85063

      - nxp,pcf85063a

      - nxp,pcf85063tp

      - nxp,pca85073a



  reg:

    maxItems: 1



  "#clock-cells":

    const: 0



  clock-output-names:

    maxItems: 1



  interrupts:

    maxItems: 1



  quartz-load-femtofarads:

    description:

      The capacitive load of the quartz(x-tal).

    enum: [7000, 12500]

    default: 7000



  clock:

    $ref: /schemas/clock/fixed-clock.yaml

    description:

      Provide this if the square wave pin is used as boot-enabled

      fixed clock.



  wakeup-source: true



allOf:

  - $ref: rtc.yaml#

  - if:

      properties:

        compatible:

          contains:

            enum:

              - microcrystal,rv8263

    then:

      properties:

        quartz-load-femtofarads: false

  - if:

      properties:

        compatible:

          contains:

            enum:

              - nxp,pcf85063

    then:

      properties:

        quartz-load-femtofarads:

          const: 7000



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        rtc@51 {

          compatible = "nxp,pcf85063a";

          reg = <0x51>;

          quartz-load-femtofarads = <12500>;



          clock {

            compatible = "fixed-clock";

            #clock-cells = <0>;

            clock-frequency = <32768>;

          };

        };

      };

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Qualcomm PM8xxx PMIC RTC device



maintainers:

  - Satya Priya <skakit@codeaurora.org>

  - Satya Priya <quic_c_skakit@quicinc.com>



properties:

  compatible: