Skip to content

Commit

Permalink
dt-bindings: Fix erroneous 'additionalProperties'
Browse files Browse the repository at this point in the history
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 <iskren.chernev@gmail.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Saravanan Sekar <sravanhome@gmail.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Rob Herring <robh@kernel.org>
  • Loading branch information
Rob Herring committed Apr 24, 2020
1 parent 8b6b802 commit 2bdfd4f
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 7 deletions.
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/mfd/st,stpmic1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,6 @@ properties:

additionalProperties: false

additionalProperties: false

additionalProperties: false

required:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ properties:
type: object

additionalProperties: false
additionalProperties: false

required:
- compatible
Expand Down
3 changes: 2 additions & 1 deletion Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ properties:
description: |
disables over voltage protection of this buck
additionalProperties: false
unevaluatedProperties: false

additionalProperties: false

required:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ patternProperties:
description:
should be "ldo1", ..., "ldo7"

unevaluatedProperties: false

"^BUCK[1-7]$":
type: object
allOf:
Expand Down Expand Up @@ -103,5 +105,7 @@ patternProperties:

required:
- regulator-name
additionalProperties: false

unevaluatedProperties: false

additionalProperties: false
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ patternProperties:
description:
should be "ldo1", ..., "ldo7"

unevaluatedProperties: false

"^BUCK[1-8]$":
type: object
allOf:
Expand Down Expand Up @@ -99,5 +101,7 @@ patternProperties:

required:
- regulator-name
additionalProperties: false

unevaluatedProperties: false

additionalProperties: false
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ patternProperties:
description:
should be "ldo1", ..., "ldo6"

unevaluatedProperties: false

"^BUCK[1-6]$":
type: object
allOf:
Expand Down Expand Up @@ -93,5 +95,7 @@ patternProperties:

required:
- regulator-name
additionalProperties: false

unevaluatedProperties: false

additionalProperties: false

0 comments on commit 2bdfd4f

Please sign in to comment.