Skip to content

Commit 927c63e

Browse files
committed
dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas
Another round from new cases in 5.19-rc of removing redundant minItems/maxItems when 'items' list is specified. This time it is in if/then schemas as the meta-schema was failing to check this case. If a property has an 'items' list, then a 'minItems' or 'maxItems' with the same size as the list is redundant and can be dropped. Note that is DT schema specific behavior and not standard json-schema behavior. The tooling will fixup the final schema adding any unspecified minItems/maxItems. Signed-off-by: Rob Herring <[email protected]> Acked-by: Guenter Roeck <[email protected]> Reviewed-by: Krzysztof Kozlowski <[email protected]> Acked-by: Ulf Hansson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent c3c09e3 commit 927c63e

File tree

3 files changed

+0
-5
lines changed

3 files changed

+0
-5
lines changed

Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ allOf:
150150
description: 5 memory controller channels and 1 for stream-id registers
151151

152152
reg-names:
153-
maxItems: 6
154153
items:
155154
- const: sid
156155
- const: broadcast
@@ -170,7 +169,6 @@ allOf:
170169
description: 17 memory controller channels and 1 for stream-id registers
171170

172171
reg-names:
173-
minItems: 18
174172
items:
175173
- const: sid
176174
- const: broadcast
@@ -202,7 +200,6 @@ allOf:
202200
description: 17 memory controller channels and 1 for stream-id registers
203201

204202
reg-names:
205-
minItems: 18
206203
items:
207204
- const: sid
208205
- const: broadcast

Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ allOf:
145145
items:
146146
- description: Xenon IP registers
147147
- description: Armada 3700 SoC PHY PAD Voltage Control register
148-
minItems: 2
149148

150149
marvell,pad-type:
151150
$ref: /schemas/types.yaml#/definitions/string

Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ if:
6464
then:
6565
properties:
6666
clocks:
67-
minItems: 2
6867
items:
6968
- description: High-frequency oscillator input, divided internally
7069
- description: Low-frequency oscillator input

0 commit comments

Comments
 (0)