Skip to content

Commit 2bdfd4f

Browse files
committed
dt-bindings: Fix erroneous 'additionalProperties'
There's several cases of json-schema 'additionalProperties' at the wrong indentation level which has the effect of making them DT properties. This is harmless, but let's fix them so a meta-schema check for this can be added. In all the cases, either the 'additionalProperties' was extra or doesn't work because there's a $ref to more properties. In the latter case, we can use 'unevaluatedProperties' instead. Reported-by: Iskren Chernev <[email protected]> Cc: Lee Jones <[email protected]> Cc: Saravanan Sekar <[email protected]> Cc: Liam Girdwood <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Rob Herring <[email protected]>
1 parent 8b6b802 commit 2bdfd4f

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

Documentation/devicetree/bindings/mfd/st,stpmic1.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,6 @@ properties:
259259

260260
additionalProperties: false
261261

262-
additionalProperties: false
263-
264262
additionalProperties: false
265263

266264
required:

Documentation/devicetree/bindings/regulator/mps,mp5416.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ properties:
3737
type: object
3838

3939
additionalProperties: false
40-
additionalProperties: false
4140

4241
required:
4342
- compatible

Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ properties:
7575
description: |
7676
disables over voltage protection of this buck
7777
78-
additionalProperties: false
78+
unevaluatedProperties: false
79+
7980
additionalProperties: false
8081

8182
required:

Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ patternProperties:
3535
description:
3636
should be "ldo1", ..., "ldo7"
3737

38+
unevaluatedProperties: false
39+
3840
"^BUCK[1-7]$":
3941
type: object
4042
allOf:
@@ -103,5 +105,7 @@ patternProperties:
103105

104106
required:
105107
- regulator-name
106-
additionalProperties: false
108+
109+
unevaluatedProperties: false
110+
107111
additionalProperties: false

Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ patternProperties:
4141
description:
4242
should be "ldo1", ..., "ldo7"
4343

44+
unevaluatedProperties: false
45+
4446
"^BUCK[1-8]$":
4547
type: object
4648
allOf:
@@ -99,5 +101,7 @@ patternProperties:
99101

100102
required:
101103
- regulator-name
102-
additionalProperties: false
104+
105+
unevaluatedProperties: false
106+
103107
additionalProperties: false

Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ patternProperties:
4040
description:
4141
should be "ldo1", ..., "ldo6"
4242

43+
unevaluatedProperties: false
44+
4345
"^BUCK[1-6]$":
4446
type: object
4547
allOf:
@@ -93,5 +95,7 @@ patternProperties:
9395

9496
required:
9597
- regulator-name
96-
additionalProperties: false
98+
99+
unevaluatedProperties: false
100+
97101
additionalProperties: false

0 commit comments

Comments
 (0)