Skip to content

Commit

Permalink
Merge tag 'rtc-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
torvalds committed May 25, 2024
2 parents 4286e1f + 4c9a91b commit 54f71b0
Show file tree
Hide file tree
Showing 29 changed files with 702 additions and 250 deletions.
19 changes: 0 additions & 19 deletions Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.txt

This file was deleted.

50 changes: 50 additions & 0 deletions Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# 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 <[email protected]>

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>;
};
24 changes: 0 additions & 24 deletions Documentation/devicetree/bindings/rtc/armada-380-rtc.txt

This file was deleted.

17 changes: 0 additions & 17 deletions Documentation/devicetree/bindings/rtc/digicolor-rtc.txt

This file was deleted.

51 changes: 51 additions & 0 deletions Documentation/devicetree/bindings/rtc/fsl,stmp3xxx-rtc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# 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 <[email protected]>

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>;
};
17 changes: 0 additions & 17 deletions Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt

This file was deleted.

15 changes: 0 additions & 15 deletions Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt

This file was deleted.

51 changes: 51 additions & 0 deletions Documentation/devicetree/bindings/rtc/marvell,armada-380-rtc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/rtc/marvell,armada-380-rtc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

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

maintainers:
- Javier Carrasco <[email protected]>

allOf:
- $ref: rtc.yaml#

properties:
compatible:
enum:
- marvell,armada-380-rtc
- marvell,armada-8k-rtc

reg:
items:
- description: RTC base address size
- description: Base address and size of SoC related registers

reg-names:
items:
- const: rtc
- const: rtc-soc

interrupts:
maxItems: 1

required:
- compatible
- reg
- reg-names
- interrupts

unevaluatedProperties: false

examples:
- |
#include <dt-bindings/interrupt-controller/arm-gic.h>
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>;
};
40 changes: 40 additions & 0 deletions Documentation/devicetree/bindings/rtc/marvell,pxa-rtc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/rtc/marvell,pxa-rtc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: PXA Real Time Clock

maintainers:
- Javier Carrasco <[email protected]>

allOf:
- $ref: rtc.yaml#

properties:
compatible:
const: marvell,pxa-rtc

reg:
maxItems: 1

interrupts:
items:
- description: 1 Hz
- description: Alarm

required:
- compatible
- reg
- interrupts

unevaluatedProperties: false

examples:
- |
rtc@40900000 {
compatible = "marvell,pxa-rtc";
reg = <0x40900000 0x3c>;
interrupts = <30>, <31>;
};
12 changes: 0 additions & 12 deletions Documentation/devicetree/bindings/rtc/maxim,ds1742.txt

This file was deleted.

21 changes: 0 additions & 21 deletions Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.txt

This file was deleted.

58 changes: 58 additions & 0 deletions Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/rtc/nxp,lpc1788-rtc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: NXP LPC1788 real-time clock

description:
The LPC1788 RTC provides calendar and clock functionality
together with periodic tick and alarm interrupt support.

maintainers:
- Javier Carrasco <[email protected]>

allOf:
- $ref: rtc.yaml#

properties:
compatible:
const: nxp,lpc1788-rtc

reg:
maxItems: 1

clocks:
items:
- description: RTC clock
- description: Register clock

clock-names:
items:
- const: rtc
- const: reg

interrupts:
maxItems: 1

required:
- compatible
- reg
- clocks
- clock-names
- interrupts

unevaluatedProperties: false

examples:
- |
#include <dt-bindings/clock/lpc18xx-ccu.h>
rtc@40046000 {
compatible = "nxp,lpc1788-rtc";
reg = <0x40046000 0x1000>;
clocks = <&creg_clk 0>, <&ccu1 CLK_CPU_BUS>;
clock-names = "rtc", "reg";
interrupts = <47>;
};
Loading

0 comments on commit 54f71b0

Please sign in to comment.