Commit 378de6df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "There are three new drivers this cycle. Also the cmos driver is
  getting fixes for longstanding wakeup issues on AMD.

  New drivers:
   - Analog Devices MAX31335
   - Nuvoton ma35d1
   - Texas Instrument TPS6594 PMIC RTC

  Drivers:
   - cmos: use ACPI alarm instead of HPET on recent AMD platforms
   - nuvoton: add NCT3015Y-R and NCT3018Y-R support
   - rv8803: proper suspend/resume and wakeup-source support"

* tag 'rtc-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (26 commits)
  rtc: nuvoton: Compatible with NCT3015Y-R and NCT3018Y-R
  rtc: da9063: Use dev_err_probe()
  rtc: da9063: Use device_get_match_data()
  rtc: da9063: Make IRQ as optional
  rtc: max31335: Fix comparison in max31335_volatile_reg()
  rtc: max31335: use regmap_update_bits_check
  rtc: max31335: remove unecessary locking
  rtc: max31335: add driver support
  dt-bindings: rtc: max31335: add max31335 bindings
  rtc: rv8803: add wakeup-source support
  rtc: ac100: remove misuses of kernel-doc
  rtc: class: Remove usage of the deprecated ida_simple_xx() API
  rtc: MAINTAINERS: drop Alessandro Zummo
  rtc: ma35d1: remove hardcoded UIE support
  dt-bindings: rtc: qcom-pm8xxx: fix inconsistent example
  rtc: rv8803: Add power management support
  rtc: ds3232: avoid unused-const-variable warning
  rtc: lpc24xx: add missing dependency
  rtc: tps6594: Add driver for TPS6594 RTC
  rtc: Add driver for Nuvoton ma35d1 rtc controller
  ...
parents 0f289bdd 14688f1a

Documentation/devicetree/bindings/rtc/adi,max31335.yaml

0 → 100644
+70 −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/adi,max31335.yaml#

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



title: Analog Devices MAX31335 RTC



maintainers:

  - Antoniu Miclaus <antoniu.miclaus@analog.com>



description:

  Analog Devices MAX31335 I2C RTC ±2ppm Automotive Real-Time Clock with

  Integrated MEMS Resonator.



allOf:

  - $ref: rtc.yaml#



properties:

  compatible:

    const: adi,max31335



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  "#clock-cells":

    description:

      RTC can be used as a clock source through its clock output pin.

    const: 0



  adi,tc-diode:

    description:

      Select the diode configuration for the trickle charger.

      schottky - Schottky diode in series.

      standard+schottky - standard diode + Schottky diode in series.

    enum: [schottky, standard+schottky]



  trickle-resistor-ohms:

    description:

      Selected resistor for trickle charger. Should be specified if trickle

      charger should be enabled.

    enum: [3000, 6000, 11000]



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

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

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        rtc@68 {

            compatible = "adi,max31335";

            reg = <0x68>;

            pinctrl-0 = <&rtc_nint_pins>;

            interrupts-extended = <&gpio1 16 IRQ_TYPE_LEVEL_HIGH>;

            aux-voltage-chargeable = <1>;

            trickle-resistor-ohms = <6000>;

            adi,tc-diode = "schottky";

        };

    };

...

Documentation/devicetree/bindings/rtc/epson,rx8900.yaml

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ properties: 


  trickle-diode-disable: true



  wakeup-source: true



required:

  - compatible

  - reg

Documentation/devicetree/bindings/rtc/nuvoton,ma35d1-rtc.yaml

0 → 100644
+48 −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,ma35d1-rtc.yaml#

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



title: Nuvoton MA35D1 Real Time Clock



maintainers:

  - Min-Jen Chen <mjchen@nuvoton.com>



allOf:

  - $ref: rtc.yaml#



properties:

  compatible:

    enum:

      - nuvoton,ma35d1-rtc



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks



unevaluatedProperties: false



examples:

  - |

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

    #include <dt-bindings/clock/nuvoton,ma35d1-clk.h>

    rtc@40410000 {

        compatible = "nuvoton,ma35d1-rtc";

        reg = <0x40410000 0x200>;

        interrupts = <GIC_SPI 5 IRQ_TYPE_EDGE_RISING>;

        clocks = <&clk RTC_GATE>;

    };



...

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

+18 −18
Original line number Diff line number Diff line
@@ -61,24 +61,24 @@ additionalProperties: false 


examples:

  - |

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

    #include <dt-bindings/spmi/spmi.h>

    spmi_bus: spmi@c440000 {

      reg = <0x0c440000 0x1100>;



    spmi {

        #address-cells = <2>;

        #size-cells = <0>;

      pmicintc: pmic@0 {



        pmic@0 {

            compatible = "qcom,pm8941", "qcom,spmi-pmic";

            reg = <0x0 SPMI_USID>;

        compatible = "qcom,pm8921";

        interrupts = <104 8>;

        #interrupt-cells = <2>;

        interrupt-controller;

            #address-cells = <1>;

            #size-cells = <0>;



        pm8921_rtc: rtc@11d {

          compatible = "qcom,pm8921-rtc";

          reg = <0x11d>;

          interrupts = <0x27 0>;

            rtc@6000 {

                compatible = "qcom,pm8941-rtc";

                reg = <0x6000>, <0x6100>;

                reg-names = "rtc", "alarm";

                interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;

                nvmem-cells = <&rtc_offset>;

                nvmem-cell-names = "offset";

            };

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -13126,6 +13126,14 @@ F: Documentation/devicetree/bindings/hwmon/adi,max31827.yaml 
F:	Documentation/hwmon/max31827.rst

F:	drivers/hwmon/max31827.c









MAX31335 RTC DRIVER









M:	Antoniu Miclaus <antoniu.miclaus@analog.com>









L:	linux-rtc@vger.kernel.org









S:	Supported









W:	https://ez.analog.com/linux-software-drivers









F:	Documentation/devicetree/bindings/rtc/adi,max31335.yaml









F:	drivers/rtc/rtc-max31335.c

















MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER









L:	linux-hwmon@vger.kernel.org









S:	Orphan








@@ -18451,7 +18459,6 @@ X:	include/linux/srcu*.h







X:	kernel/rcu/srcu*.c

















REAL TIME CLOCK (RTC) SUBSYSTEM









M:	Alessandro Zummo <a.zummo@towertech.it>









M:	Alexandre Belloni <alexandre.belloni@bootlin.com>









L:	linux-rtc@vger.kernel.org









S:	Maintained