summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/rtc
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2022-05-09 11:50:27 -0500
committerRob Herring <robh@kernel.org>2022-05-09 11:50:27 -0500
commit52bf4b7147e5a0446ec5bdfe92106f0e16bf281f (patch)
tree81cbd53b5fc89165e34bdc4d29c5c672e218cf70 /Documentation/devicetree/bindings/rtc
parent0f6983509ea126e41b8cfd17bc490cba0df58728 (diff)
parent5dc4630426511f641b7ac44fc550b8e21eafb237 (diff)
downloadlinux-stable-52bf4b7147e5a0446ec5bdfe92106f0e16bf281f.tar.gz
linux-stable-52bf4b7147e5a0446ec5bdfe92106f0e16bf281f.tar.bz2
linux-stable-52bf4b7147e5a0446ec5bdfe92106f0e16bf281f.zip
Merge branch 'dt/linus' into dt/next
Pick up new meta-schema fixes.
Diffstat (limited to 'Documentation/devicetree/bindings/rtc')
-rw-r--r--Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml10
1 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml b/Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml
index 0b767fec39d8..6b38bd7eb3b4 100644
--- a/Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml
+++ b/Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml
@@ -71,7 +71,6 @@ allOf:
then:
properties:
clock-output-names:
- minItems: 1
maxItems: 1
- if:
@@ -102,7 +101,6 @@ allOf:
properties:
clock-output-names:
minItems: 3
- maxItems: 3
- if:
properties:
@@ -113,16 +111,12 @@ allOf:
then:
properties:
clocks:
- minItems: 3
- maxItems: 3
items:
- description: Bus clock for register access
- description: 24 MHz oscillator
- description: 32 kHz clock from the CCU
clock-names:
- minItems: 3
- maxItems: 3
items:
- const: bus
- const: hosc
@@ -142,7 +136,6 @@ allOf:
properties:
clocks:
minItems: 3
- maxItems: 4
items:
- description: Bus clock for register access
- description: 24 MHz oscillator
@@ -151,7 +144,6 @@ allOf:
clock-names:
minItems: 3
- maxItems: 4
items:
- const: bus
- const: hosc
@@ -174,14 +166,12 @@ allOf:
then:
properties:
interrupts:
- minItems: 1
maxItems: 1
else:
properties:
interrupts:
minItems: 2
- maxItems: 2
required:
- "#clock-cells"