2022-08-23 18:03:50

by Rob Herring (Arm)

[permalink] [raw]
Subject: [PATCH] regulator: dt-bindings: Add missing (unevaluated|additional)Properties on child nodes

In order to ensure only documented properties are present, node schemas
must have unevaluatedProperties or additionalProperties set to false
(typically).

Signed-off-by: Rob Herring <[email protected]>
---
.../bindings/regulator/dlg,da9121.yaml | 1 +
.../bindings/regulator/maxim,max77802.yaml | 1 +
.../bindings/regulator/maxim,max8997.yaml | 1 +
.../bindings/regulator/mt6315-regulator.yaml | 1 +
.../bindings/regulator/qcom,spmi-regulator.yaml | 1 +
.../regulator/qcom-labibb-regulator.yaml | 16 ++++++++++++++++
.../regulator/richtek,rt4801-regulator.yaml | 1 +
.../regulator/rohm,bd71815-regulator.yaml | 1 +
8 files changed, 23 insertions(+)

diff --git a/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml b/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
index 24ace6e1e5ec..63e1161a87de 100644
--- a/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
+++ b/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
@@ -83,6 +83,7 @@ properties:

regulators:
type: object
+ additionalProperties: false
description: |
List of regulators provided by the device

diff --git a/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml b/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml
index 236348c4710c..71138c611b6c 100644
--- a/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml
+++ b/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml
@@ -79,6 +79,7 @@ patternProperties:
patternProperties:
regulator-state-(standby|mem|disk):
type: object
+ additionalProperties: true
properties:
regulator-mode: false

diff --git a/Documentation/devicetree/bindings/regulator/maxim,max8997.yaml b/Documentation/devicetree/bindings/regulator/maxim,max8997.yaml
index 4321f061a7f6..2b266ea43716 100644
--- a/Documentation/devicetree/bindings/regulator/maxim,max8997.yaml
+++ b/Documentation/devicetree/bindings/regulator/maxim,max8997.yaml
@@ -111,6 +111,7 @@ properties:

regulators:
type: object
+ additionalProperties: false
description:
List of child nodes that specify the regulators.

diff --git a/Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml b/Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml
index 37402c370fbb..364b58730be2 100644
--- a/Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml
@@ -29,6 +29,7 @@ properties:
"^vbuck[1-4]$":
type: object
$ref: "regulator.yaml#"
+ unevaluatedProperties: false

properties:
regulator-compatible:
diff --git a/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml
index 8b7c4af4b551..3266cd0c580f 100644
--- a/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml
@@ -35,6 +35,7 @@ patternProperties:
description: List of regulators and its properties
type: object
$ref: regulator.yaml#
+ unevaluatedProperties: false

properties:
qcom,ocp-max-retries:
diff --git a/Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml
index 1ddc1efd19e2..f97b8083678f 100644
--- a/Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml
@@ -20,6 +20,7 @@ properties:

lab:
type: object
+ additionalProperties: false

properties:
qcom,soft-start-us:
@@ -33,11 +34,19 @@ properties:
description:
Short-circuit and over-current interrupts for lab.

+ interrupt-names:
+ minItems: 1
+ items:
+ - const: sc-err
+ - const: ocp
+
required:
- interrupts
+ - interrupt-names

ibb:
type: object
+ additionalProperties: false

properties:
qcom,discharge-resistor-kohms:
@@ -52,8 +61,15 @@ properties:
description:
Short-circuit and over-current interrupts for ibb.

+ interrupt-names:
+ minItems: 1
+ items:
+ - const: sc-err
+ - const: ocp
+
required:
- interrupts
+ - interrupt-names

required:
- compatible
diff --git a/Documentation/devicetree/bindings/regulator/richtek,rt4801-regulator.yaml b/Documentation/devicetree/bindings/regulator/richtek,rt4801-regulator.yaml
index 091150c4e579..4a8a221bc902 100644
--- a/Documentation/devicetree/bindings/regulator/richtek,rt4801-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/richtek,rt4801-regulator.yaml
@@ -42,6 +42,7 @@ patternProperties:
"^DSV(P|N)$":
type: object
$ref: regulator.yaml#
+ unevaluatedProperties: false
description:
Properties for single display bias regulator.

diff --git a/Documentation/devicetree/bindings/regulator/rohm,bd71815-regulator.yaml b/Documentation/devicetree/bindings/regulator/rohm,bd71815-regulator.yaml
index 7d0adb74a396..d61e8675f067 100644
--- a/Documentation/devicetree/bindings/regulator/rohm,bd71815-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/rohm,bd71815-regulator.yaml
@@ -27,6 +27,7 @@ properties:
description:
properties for wled regulator
$ref: regulator.yaml#
+ unevaluatedProperties: false

properties:
regulator-name:
--
2.34.1


2022-08-23 19:37:14

by Robert Marko

[permalink] [raw]
Subject: Re: [PATCH] regulator: dt-bindings: Add missing (unevaluated|additional)Properties on child nodes

On Tue, 23 Aug 2022 at 16:57, Rob Herring <[email protected]> wrote:
>
> In order to ensure only documented properties are present, node schemas
> must have unevaluatedProperties or additionalProperties set to false
> (typically).
>
> Signed-off-by: Rob Herring <[email protected]>
> ---
> .../bindings/regulator/dlg,da9121.yaml | 1 +
> .../bindings/regulator/maxim,max77802.yaml | 1 +
> .../bindings/regulator/maxim,max8997.yaml | 1 +
> .../bindings/regulator/mt6315-regulator.yaml | 1 +
> .../bindings/regulator/qcom,spmi-regulator.yaml | 1 +
> .../regulator/qcom-labibb-regulator.yaml | 16 ++++++++++++++++
> .../regulator/richtek,rt4801-regulator.yaml | 1 +
> .../regulator/rohm,bd71815-regulator.yaml | 1 +
> 8 files changed, 23 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml b/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
> index 24ace6e1e5ec..63e1161a87de 100644
> --- a/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
> +++ b/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
> @@ -83,6 +83,7 @@ properties:
>
> regulators:
> type: object
> + additionalProperties: false
> description: |
> List of regulators provided by the device
>
> diff --git a/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml b/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml
> index 236348c4710c..71138c611b6c 100644
> --- a/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml
> +++ b/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml
> @@ -79,6 +79,7 @@ patternProperties:
> patternProperties:
> regulator-state-(standby|mem|disk):
> type: object
> + additionalProperties: true
> properties:
> regulator-mode: false
>
> diff --git a/Documentation/devicetree/bindings/regulator/maxim,max8997.yaml b/Documentation/devicetree/bindings/regulator/maxim,max8997.yaml
> index 4321f061a7f6..2b266ea43716 100644
> --- a/Documentation/devicetree/bindings/regulator/maxim,max8997.yaml
> +++ b/Documentation/devicetree/bindings/regulator/maxim,max8997.yaml
> @@ -111,6 +111,7 @@ properties:
>
> regulators:
> type: object
> + additionalProperties: false
> description:
> List of child nodes that specify the regulators.
>
> diff --git a/Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml b/Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml
> index 37402c370fbb..364b58730be2 100644
> --- a/Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml
> +++ b/Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml
> @@ -29,6 +29,7 @@ properties:
> "^vbuck[1-4]$":
> type: object
> $ref: "regulator.yaml#"
> + unevaluatedProperties: false
>
> properties:
> regulator-compatible:
> diff --git a/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml
> index 8b7c4af4b551..3266cd0c580f 100644
> --- a/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml
> +++ b/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml
> @@ -35,6 +35,7 @@ patternProperties:
> description: List of regulators and its properties
> type: object
> $ref: regulator.yaml#
> + unevaluatedProperties: false
>
> properties:
> qcom,ocp-max-retries:
> diff --git a/Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml
> index 1ddc1efd19e2..f97b8083678f 100644
> --- a/Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml
> +++ b/Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml
> @@ -20,6 +20,7 @@ properties:
>
> lab:
> type: object
> + additionalProperties: false
>
> properties:
> qcom,soft-start-us:
> @@ -33,11 +34,19 @@ properties:
> description:
> Short-circuit and over-current interrupts for lab.
>
> + interrupt-names:
> + minItems: 1
> + items:
> + - const: sc-err
> + - const: ocp
> +
> required:
> - interrupts
> + - interrupt-names
>
> ibb:
> type: object
> + additionalProperties: false
>
> properties:
> qcom,discharge-resistor-kohms:
> @@ -52,8 +61,15 @@ properties:
> description:
> Short-circuit and over-current interrupts for ibb.
>
> + interrupt-names:
> + minItems: 1
> + items:
> + - const: sc-err
> + - const: ocp
> +
> required:
> - interrupts
> + - interrupt-names
>
> required:
> - compatible
> diff --git a/Documentation/devicetree/bindings/regulator/richtek,rt4801-regulator.yaml b/Documentation/devicetree/bindings/regulator/richtek,rt4801-regulator.yaml
> index 091150c4e579..4a8a221bc902 100644
> --- a/Documentation/devicetree/bindings/regulator/richtek,rt4801-regulator.yaml
> +++ b/Documentation/devicetree/bindings/regulator/richtek,rt4801-regulator.yaml
> @@ -42,6 +42,7 @@ patternProperties:
> "^DSV(P|N)$":
> type: object
> $ref: regulator.yaml#
> + unevaluatedProperties: false
> description:
> Properties for single display bias regulator.
>
> diff --git a/Documentation/devicetree/bindings/regulator/rohm,bd71815-regulator.yaml b/Documentation/devicetree/bindings/regulator/rohm,bd71815-regulator.yaml
> index 7d0adb74a396..d61e8675f067 100644
> --- a/Documentation/devicetree/bindings/regulator/rohm,bd71815-regulator.yaml
> +++ b/Documentation/devicetree/bindings/regulator/rohm,bd71815-regulator.yaml
> @@ -27,6 +27,7 @@ properties:
> description:
> properties for wled regulator
> $ref: regulator.yaml#
> + unevaluatedProperties: false
>
> properties:
> regulator-name:
> --
> 2.34.1

For qcom,spmi-regulator.yaml:
Reviewed-by: Robert Marko <[email protected]>
>

2022-08-23 19:53:59

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] regulator: dt-bindings: Add missing (unevaluated|additional)Properties on child nodes

On Tue, 23 Aug 2022 09:56:38 -0500, Rob Herring wrote:
> In order to ensure only documented properties are present, node schemas
> must have unevaluatedProperties or additionalProperties set to false
> (typically).
>
>

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: dt-bindings: Add missing (unevaluated|additional)Properties on child nodes
commit: de6fbef10c4b9c589f3b84bd926e56ba742263ea

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark