Commit 0e287d31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "New drivers:
   - Amlogic A4 and A5 RTC
   - Marvell 88PM886 PMIC RTC
   - Renesas RTCA-3 for Renesas RZ/G3S

  Driver updates:
   - ab-eoz9: fix temperature and alarm support
   - cmos: improve locking behaviour
   - isl12022: add alarm support
   - m48t59: improve epoch handling
   - mt6359: add range
   - rzn1: fix BCD conversions and simplify driver"

* tag 'rtc-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (38 commits)
  rtc: ab-eoz9: don't fail temperature reads on undervoltage notification
  rtc: rzn1: reduce register access
  rtc: rzn1: drop superfluous wday calculation
  m68k: mvme147, mvme16x: Adopt rtc-m48t59 platform driver
  rtc: brcmstb-waketimer: don't include 'pm_wakeup.h' directly
  rtc: m48t59: Use platform_data struct for year offset value
  rtc: ab-eoz9: fix abeoz9_rtc_read_alarm
  rtc: rv3028: fix RV3028_TS_COUNT type
  rtc: rzn1: update Michel's email
  rtc: rzn1: fix BCD to rtc_time conversion errors
  rtc: amlogic-a4: fix compile error
  rtc: amlogic-a4: drop error messages
  MAINTAINERS: Add an entry for Amlogic RTC driver
  rtc: support for the Amlogic on-chip RTC
  dt-bindings: rtc: Add Amlogic A4 and A5 RTC
  rtc: add driver for Marvell 88PM886 PMIC RTC
  rtc: check if __rtc_read_time was successful in rtc_timer_do_work()
  rtc: pcf8563: Switch to regmap
  rtc: pcf8563: Sort headers alphabetically
  rtc: abx80x: Fix WDT bit position of the status register
  ...
parents 831c1926 e0779a0d

Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ properties: 
          - const: allwinner,sun50i-a64-rtc

          - const: allwinner,sun8i-h3-rtc

      - items:

          - const: allwinner,sun20i-d1-rtc

          - enum:

              - allwinner,sun20i-d1-rtc

              - allwinner,sun55i-a523-rtc

          - const: allwinner,sun50i-r329-rtc



  reg:

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

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

# Copyright (C) 2024 Amlogic, Inc. All rights reserved

%YAML 1.2

---

$id: http://devicetree.org/schemas/rtc/amlogic,a4-rtc.yaml#

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



title: Amlogic A4 and A5 RTC



maintainers:

  - Yiting Deng <yiting.deng@amlogic.com>

  - Xianwei Zhao <xianwei.zhao@amlogic.com>



allOf:

  - $ref: rtc.yaml#



properties:

  compatible:

    enum:

      - amlogic,a4-rtc

      - amlogic,a5-rtc



  reg:

    maxItems: 1



  clocks:

    items:

      - description: RTC clock source, available 24M or 32K crystal

          oscillator source. when using 24M, need to divide 24M into 32K.

      - description: RTC module accesses the clock of the apb bus.



  clock-names:

    items:

      - const: osc

      - const: sys



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - interrupts



additionalProperties: false



examples:

  - |

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

    apb {

        #address-cells = <2>;

        #size-cells = <2>;



        rtc@8e600 {

            compatible = "amlogic,a4-rtc";

            reg = <0x0 0x8e600 0x0 0x38>;

            clocks = <&xtal_32k>, <&clkc_periphs 1>;

            clock-names = "osc", "sys";

            interrupts = <GIC_SPI 131 IRQ_TYPE_EDGE_RISING>;

        };

    };

Documentation/devicetree/bindings/rtc/microchip,mfps-rtc.yaml→Documentation/devicetree/bindings/rtc/microchip,mpfs-rtc.yaml

+6 −4
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/microchip,mfps-rtc.yaml#

$id: http://devicetree.org/schemas/rtc/microchip,mpfs-rtc.yaml#



$schema: http://devicetree.org/meta-schemas/core.yaml#
@@ -12,12 +12,14 @@ allOf: 


maintainers:

  - Daire McNamara <daire.mcnamara@microchip.com>

  - Lewis Hanly <lewis.hanly@microchip.com>



properties:

  compatible:

    enum:

      - microchip,mpfs-rtc

    oneOf:

      - items:

          - const: microchip,pic64gx-rtc

          - const: microchip,mpfs-rtc

      - const: microchip,mpfs-rtc



  reg:

    maxItems: 1

Documentation/devicetree/bindings/rtc/renesas,rz-rtca3.yaml

0 → 100644
+84 −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/renesas,rz-rtca3.yaml#

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



title: Renesas RTCA-3 Real Time Clock



maintainers:

  - Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>



allOf:

  - $ref: rtc.yaml#



properties:

  compatible:

    items:

      - enum:

          - renesas,r9a08g045-rtca3 # RZ/G3S

      - const: renesas,rz-rtca3



  reg:

    maxItems: 1



  interrupts:

    items:

      - description: Alarm interrupt

      - description: Periodic interrupt

      - description: Carry interrupt



  interrupt-names:

    items:

      - const: alarm

      - const: period

      - const: carry



  clocks:

    items:

      - description: RTC bus clock

      - description: RTC counter clock



  clock-names:

    items:

      - const: bus

      - const: counter



  power-domains:

    maxItems: 1



  resets:

    items:

      - description: VBATTB module reset



required:

  - compatible

  - reg

  - interrupts

  - interrupt-names

  - clocks

  - clock-names

  - power-domains

  - resets



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/r9a08g045-cpg.h>

    #include <dt-bindings/clock/renesas,r9a08g045-vbattb.h>

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

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



    rtc@1004ec00 {

        compatible = "renesas,r9a08g045-rtca3", "renesas,rz-rtca3";

        reg = <0x1004ec00 0x400>;

        interrupts = <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,

                     <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,

                     <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>;

        interrupt-names = "alarm", "period", "carry";

        clocks = <&cpg CPG_MOD R9A08G045_VBAT_BCLK>, <&vbattclk VBATTB_VBATTCLK>;

        clock-names = "bus", "counter";

        power-domains = <&cpg>;

        resets = <&cpg R9A08G045_VBAT_BRESETN>;

    };

MAINTAINERS

+17 −0
Original line number Diff line number Diff line
@@ -1218,6 +1218,14 @@ F: Documentation/devicetree/bindings/perf/amlogic,g12-ddr-pmu.yaml 
F:	drivers/perf/amlogic/

F:	include/soc/amlogic/









AMLOGIC RTC DRIVER









M:	Yiting Deng <yiting.deng@amlogic.com>









M:	Xianwei Zhao <xianwei.zhao@amlogic.com>









L:	linux-amlogic@lists.infradead.org









S:	Maintained









F:	Documentation/devicetree/bindings/rtc/amlogic,a4-rtc.yaml









F:	drivers/rtc/rtc-amlogic-a4.c

















AMPHENOL CHIPCAP 2 HUMIDITY-TEMPERATURE IIO DRIVER









M:	Javier Carrasco <javier.carrasco.cruz@gmail.com>









L:	linux-hwmon@vger.kernel.org








@@ -13794,6 +13802,7 @@ F:	Documentation/devicetree/bindings/mfd/marvell,88pm886-a1.yaml







F:	drivers/input/misc/88pm886-onkey.c









F:	drivers/mfd/88pm886.c









F:	drivers/regulator/88pm886-regulator.c









F:	drivers/rtc/rtc-88pm886.c









F:	include/linux/mfd/88pm886.h

















MARVELL ARMADA 3700 PHY DRIVERS








@@ -19915,6 +19924,14 @@ S:	Supported







F:	Documentation/devicetree/bindings/timer/renesas,rz-mtu3.yaml









F:	drivers/counter/rz-mtu3-cnt.c

















RENESAS RTCA-3 RTC DRIVER









M:	Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>









L:	linux-rtc@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/rtc/renesas,rz-rtca3.yaml









F:	drivers/rtc/rtc-renesas-rtca3.c

















RENESAS RZ/N1 A5PSW SWITCH DRIVER









M:	Clément Léger <clement.leger@bootlin.com>









L:	linux-renesas-soc@vger.kernel.org