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

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

Pull RTC updates from Alexandre Belloni:
 "Support for a new RTC in an existing driver and all the drivers
  exposing clocks using the common clock framework have been converted
  to determine_rate(). Summary:

  Subsystem:
   - Convert drivers exposing a clock from round_rate() to determine_rate()

  Drivers:
   - ds1307: oscillator stop flag handling for ds1341
   - pcf85063: add support for RV8063"

* tag 'rtc-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (34 commits)
  rtc: ds1685: Update Joshua Kinard's email address.
  rtc: rv3032: convert from round_rate() to determine_rate()
  rtc: rv3028: convert from round_rate() to determine_rate()
  rtc: pcf8563: convert from round_rate() to determine_rate()
  rtc: pcf85063: convert from round_rate() to determine_rate()
  rtc: nct3018y: convert from round_rate() to determine_rate()
  rtc: max31335: convert from round_rate() to determine_rate()
  rtc: m41t80: convert from round_rate() to determine_rate()
  rtc: hym8563: convert from round_rate() to determine_rate()
  rtc: ds1307: convert from round_rate() to determine_rate()
  rtc: rv3028: fix incorrect maximum clock rate handling
  rtc: pcf8563: fix incorrect maximum clock rate handling
  rtc: pcf85063: fix incorrect maximum clock rate handling
  rtc: nct3018y: fix incorrect maximum clock rate handling
  rtc: hym8563: fix incorrect maximum clock rate handling
  rtc: ds1307: fix incorrect maximum clock rate handling
  rtc: pcf85063: scope pcf85063_config structures
  rtc: Optimize calculations in rtc_time64_to_tm()
  dt-bindings: rtc: amlogic,a4-rtc: Add compatible string for C3
  rtc: ds1307: handle oscillator stop flag (OSF) for ds1341
  ...
parents 806381e1 bb5b0b43

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

+8 −3
Original line number Diff line number Diff line
@@ -16,9 +16,14 @@ allOf: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - amlogic,a4-rtc

          - amlogic,a5-rtc

      - items:

          - enum:

              - amlogic,c3-rtc

          - const: amlogic,a5-rtc



  reg:

    maxItems: 1

Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.yaml

+6 −1
Original line number Diff line number Diff line
@@ -18,7 +18,12 @@ allOf: 


properties:

  compatible:

    const: nxp,lpc1788-rtc

    oneOf:

      - items:

          - enum:

              - nxp,lpc1850-rtc

          - const: nxp,lpc1788-rtc

      - const: nxp,lpc1788-rtc



  reg:

    maxItems: 1

Documentation/devicetree/bindings/rtc/nxp,lpc3220-rtc.yaml

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

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



title: NXP LPC32xx SoC Real-time Clock



maintainers:

  - Frank Li <Frank.Li@nxp.com>



properties:

  compatible:

    enum:

      - nxp,lpc3220-rtc



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  interrupts:

    maxItems: 1



  start-year: true



required:

  - compatible

  - reg



allOf:

  - $ref: rtc.yaml#



unevaluatedProperties: false



examples:

  - |

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

    #include <dt-bindings/clock/lpc32xx-clock.h>



    rtc@40024000 {

        compatible = "nxp,lpc3220-rtc";

        reg = <0x40024000 0x1000>;

        interrupt-parent = <&sic1>;

        interrupts = <20 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&clk LPC32XX_CLK_RTC>;

    };

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

+32 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ maintainers: 
properties:

  compatible:

    enum:

      - microcrystal,rv8063

      - microcrystal,rv8263

      - nxp,pcf85063

      - nxp,pcf85063a
@@ -44,13 +45,19 @@ properties: 


  wakeup-source: true



  spi-cs-high: true



  spi-3wire: true



allOf:

  - $ref: /schemas/spi/spi-peripheral-props.yaml#

  - $ref: rtc.yaml#

  - if:

      properties:

        compatible:

          contains:

            enum:

              - microcrystal,rv8063

              - microcrystal,rv8263

    then:

      properties:
@@ -65,12 +72,23 @@ allOf: 
      properties:

        quartz-load-femtofarads:

          const: 7000

  - if:

      properties:

        compatible:

          not:

            contains:

              enum:

                - microcrystal,rv8063

    then:

      properties:

        spi-cs-high: false

        spi-3wire: false



required:

  - compatible

  - reg



additionalProperties: false

unevaluatedProperties: false



examples:

  - |
@@ -90,3 +108,16 @@ examples: 
          };

        };

      };



  - |

    spi {

        #address-cells = <1>;

        #size-cells = <0>;



        rtc@0 {

            compatible = "microcrystal,rv8063";

            reg = <0>;

            spi-cs-high;

            spi-3wire;

        };

    };

Documentation/devicetree/bindings/soc/sophgo/sophgo,cv1800b-rtc.yaml→Documentation/devicetree/bindings/rtc/sophgo,cv1800b-rtc.yaml

+1 −1
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/sophgo/sophgo,cv1800b-rtc.yaml#

$id: http://devicetree.org/schemas/rtc/sophgo,cv1800b-rtc.yaml#

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



title: Real Time Clock of the Sophgo CV1800 SoC