Commit 54f71b03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "There is one new driver and then most of the changes are the device
  tree bindings conversions to yaml.

  New driver:
   - Epson RX8111

  Drivers:
   - Many Device Tree bindings conversions to dtschema
   - pcf8563: wakeup-source support"

* tag 'rtc-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  pcf8563: add wakeup-source support
  rtc: rx8111: handle VLOW flag
  rtc: rx8111: demote warnings to debug level
  rtc: rx6110: Constify struct regmap_config
  dt-bindings: rtc: convert trivial devices into dtschema
  dt-bindings: rtc: stmp3xxx-rtc: convert to dtschema
  dt-bindings: rtc: pxa-rtc: convert to dtschema
  rtc: Add driver for Epson RX8111
  dt-bindings: rtc: Add Epson RX8111
  rtc: mcp795: drop unneeded MODULE_ALIAS
  rtc: nuvoton: Modify part number value
  rtc: test: Split rtc unit test into slow and normal speed test
  dt-bindings: rtc: nxp,lpc1788-rtc: convert to dtschema
  dt-bindings: rtc: digicolor-rtc: move to trivial-rtc
  dt-bindings: rtc: alphascale,asm9260-rtc: convert to dtschema
  dt-bindings: rtc: armada-380-rtc: convert to dtschema
  rtc: cros-ec: provide ID table for avoiding fallback match
parents 4286e1fc 4c9a91b9

Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.txt

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
* Alphascale asm9260 SoC Real Time Clock



Required properties:

- compatible: Should be "alphascale,asm9260-rtc"

- reg: Physical base address of the controller and length

       of memory mapped region.

- interrupts: IRQ line for the RTC.

- clocks: Reference to the clock entry.

- clock-names: should contain:

  * "ahb" for the SoC RTC clock



Example:

rtc0: rtc@800a0000 {

	compatible = "alphascale,asm9260-rtc";

	reg = <0x800a0000 0x100>;

	clocks = <&acc CLKID_AHB_RTC>;

	clock-names = "ahb";

	interrupts = <2>;

};

Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/rtc/alphascale,asm9260-rtc.yaml#

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



title: Alphascale asm9260 SoC Real Time Clock



maintainers:

  - Javier Carrasco <javier.carrasco.cruz@gmail.com>



allOf:

  - $ref: rtc.yaml#



properties:

  compatible:

    const: alphascale,asm9260-rtc



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-names:

    const: ahb



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - interrupts



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/alphascale,asm9260.h>



    rtc@800a0000 {

        compatible = "alphascale,asm9260-rtc";

        reg = <0x800a0000 0x100>;

        clocks = <&acc CLKID_AHB_RTC>;

        clock-names = "ahb";

        interrupts = <2>;

    };

Documentation/devicetree/bindings/rtc/armada-380-rtc.txt

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
* Real Time Clock of the Armada 38x/7K/8K SoCs



RTC controller for the Armada 38x, 7K and 8K SoCs



Required properties:

- compatible : Should be one of the following:

	"marvell,armada-380-rtc" for Armada 38x SoC

	"marvell,armada-8k-rtc" for Aramda 7K/8K SoCs

- reg: a list of base address and size pairs, one for each entry in

  reg-names

- reg names: should contain:

  * "rtc" for the RTC registers

  * "rtc-soc" for the SoC related registers and among them the one

    related to the interrupt.

- interrupts: IRQ line for the RTC.



Example:



rtc@a3800 {

	compatible = "marvell,armada-380-rtc";

	reg = <0xa3800 0x20>, <0x184a0 0x0c>;

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

	interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;

};

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

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
Conexant Digicolor Real Time Clock controller



This binding currently supports the CX92755 SoC.



Required properties:

- compatible: should be "cnxt,cx92755-rtc"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: rtc alarm interrupt



Example:



	rtc@f0000c30 {

		compatible = "cnxt,cx92755-rtc";

		reg = <0xf0000c30 0x18>;

		interrupts = <25>;

	};

Documentation/devicetree/bindings/rtc/fsl,stmp3xxx-rtc.yaml

0 → 100644
+51 −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/fsl,stmp3xxx-rtc.yaml#

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



title: STMP3xxx/i.MX28 Time Clock Controller



maintainers:

  - Javier Carrasco <javier.carrasco.cruz@gmail.com>



allOf:

  - $ref: rtc.yaml#



properties:

  compatible:

    oneOf:

      - items:

          - enum:

              - fsl,imx28-rtc

              - fsl,imx23-rtc

          - const: fsl,stmp3xxx-rtc

      - const: fsl,stmp3xxx-rtc



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  stmp,crystal-freq:

    description:

      Override crystal frequency as determined from fuse bits.

      Use <0> for "no crystal".

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

    enum: [0, 32000, 32768]



required:

  - compatible

  - reg

  - interrupts



unevaluatedProperties: false



examples:

  - |

    rtc@80056000 {

        compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc";

        reg = <0x80056000 2000>;

        interrupts = <29>;

    };