2021-06-23 16:44:38

by Rob Herring (Arm)

Subject: [PATCH] dt-bindings: Fix 'unevaluatedProperties' errors in DT graph users

In testing out under development json-schema 2020-12 support, there's a
few issues with 'unevaluatedProperties' and the graph schema. If
'graph.yaml#/properties/port' is used, then neither the port nor the
endpoint(s) can have additional properties. 'graph.yaml#/$defs/port-base'
needs to be used instead.

Cc: Sakari Ailus <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: "Paul J. Murphy" <[email protected]>
Cc: Daniele Alessandrelli <[email protected]>
Cc: "Niklas Söderlund" <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Paul Kocialkowski <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Rob Herring <[email protected]>
---
.../devicetree/bindings/display/bridge/lontium,lt8912b.yaml | 3 ++-
Documentation/devicetree/bindings/media/i2c/imx258.yaml | 2 +-
Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml | 2 +-
Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml | 2 +-
Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml | 2 +-
Documentation/devicetree/bindings/media/renesas,vin.yaml | 3 ++-
6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml b/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
index 735d0233a7d6..674891ee2f8e 100644
--- a/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
@@ -29,7 +29,8 @@ properties:

properties:
port@0:
- $ref: /schemas/graph.yaml#/properties/port
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
description:
Primary MIPI port for MIPI input

diff --git a/Documentation/devicetree/bindings/media/i2c/imx258.yaml b/Documentation/devicetree/bindings/media/i2c/imx258.yaml
index 515317eff41a..cde0f7383b2a 100644
--- a/Documentation/devicetree/bindings/media/i2c/imx258.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/imx258.yaml
@@ -49,7 +49,7 @@ properties:

# See ../video-interfaces.txt for more details
port:
- $ref: /schemas/graph.yaml#/properties/port
+ $ref: /schemas/graph.yaml#/$defs/port-base
additionalProperties: false

properties:
diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
index 9149f5685688..246dc5fec716 100644
--- a/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
@@ -45,7 +45,7 @@ properties:

port:
description: MIPI CSI-2 transmitter port
- $ref: /schemas/graph.yaml#/properties/port
+ $ref: /schemas/graph.yaml#/$defs/port-base
additionalProperties: false

properties:
diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
index 0699c7e4fdeb..b962863e4f65 100644
--- a/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
@@ -45,7 +45,7 @@ properties:

port:
description: MIPI CSI-2 transmitter port
- $ref: /schemas/graph.yaml#/properties/port
+ $ref: /schemas/graph.yaml#/$defs/port-base
additionalProperties: false

properties:
diff --git a/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml b/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
index 27cc5b7ff613..f5055b9db693 100644
--- a/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
@@ -37,7 +37,7 @@ properties:

port:
additionalProperties: false
- $ref: /schemas/graph.yaml#/properties/port
+ $ref: /schemas/graph.yaml#/$defs/port-base

properties:
endpoint:
diff --git a/Documentation/devicetree/bindings/media/renesas,vin.yaml b/Documentation/devicetree/bindings/media/renesas,vin.yaml
index dd1a5ce5896c..4945a2f0eca6 100644
--- a/Documentation/devicetree/bindings/media/renesas,vin.yaml
+++ b/Documentation/devicetree/bindings/media/renesas,vin.yaml
@@ -118,7 +118,8 @@ properties:

properties:
port@0:
- $ref: /schemas/graph.yaml#/properties/port
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
description:
Input port node, single endpoint describing a parallel input source.

--
2.27.0

2021-06-24 06:36:41

by Krzysztof Kozlowski

Subject: Re: [PATCH] dt-bindings: Fix 'unevaluatedProperties' errors in DT graph users

On 23/06/2021 18:43, Rob Herring wrote:
> In testing out under development json-schema 2020-12 support, there's a
> few issues with 'unevaluatedProperties' and the graph schema. If
> 'graph.yaml#/properties/port' is used, then neither the port nor the
> endpoint(s) can have additional properties. 'graph.yaml#/$defs/port-base'
> needs to be used instead.
>
> Cc: Sakari Ailus <[email protected]>
> Cc: Mauro Carvalho Chehab <[email protected]>
> Cc: "Paul J. Murphy" <[email protected]>
> Cc: Daniele Alessandrelli <[email protected]>
> Cc: "Niklas Söderlund" <[email protected]>
> Cc: Krzysztof Kozlowski <[email protected]>
> Cc: Paul Kocialkowski <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Rob Herring <[email protected]>
> ---
> .../devicetree/bindings/display/bridge/lontium,lt8912b.yaml | 3 ++-
> Documentation/devicetree/bindings/media/i2c/imx258.yaml | 2 +-
> Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml | 2 +-
> Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml | 2 +-
> Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml | 2 +-
> Documentation/devicetree/bindings/media/renesas,vin.yaml | 3 ++-
> 6 files changed, 8 insertions(+), 6 deletions(-)
>


Acked-by: Krzysztof Kozlowski <[email protected]>


Best regards,
Krzysztof

2021-06-28 09:18:20

by Niklas Söderlund

Subject: Re: [PATCH] dt-bindings: Fix 'unevaluatedProperties' errors in DT graph users

Hi Rob,

Thanks for your work.

On 2021-06-23 10:43:44 -0600, Rob Herring wrote:
> In testing out under development json-schema 2020-12 support, there's a
> few issues with 'unevaluatedProperties' and the graph schema. If
> 'graph.yaml#/properties/port' is used, then neither the port nor the
> endpoint(s) can have additional properties. 'graph.yaml#/$defs/port-base'
> needs to be used instead.
>
> Cc: Sakari Ailus <[email protected]>
> Cc: Mauro Carvalho Chehab <[email protected]>
> Cc: "Paul J. Murphy" <[email protected]>
> Cc: Daniele Alessandrelli <[email protected]>
> Cc: "Niklas S?derlund" <[email protected]>
> Cc: Krzysztof Kozlowski <[email protected]>
> Cc: Paul Kocialkowski <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Rob Herring <[email protected]>
> ---
> .../devicetree/bindings/display/bridge/lontium,lt8912b.yaml | 3 ++-
> Documentation/devicetree/bindings/media/i2c/imx258.yaml | 2 +-
> Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml | 2 +-
> Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml | 2 +-
> Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml | 2 +-
> Documentation/devicetree/bindings/media/renesas,vin.yaml | 3 ++-

For renesas,vin

Reviewed-by: Niklas S?derlund <[email protected]>

> 6 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml b/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
> index 735d0233a7d6..674891ee2f8e 100644
> --- a/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
> +++ b/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
> @@ -29,7 +29,8 @@ properties:
>
> properties:
> port@0:
> - $ref: /schemas/graph.yaml#/properties/port
> + $ref: /schemas/graph.yaml#/$defs/port-base
> + unevaluatedProperties: false
> description:
> Primary MIPI port for MIPI input
>
> diff --git a/Documentation/devicetree/bindings/media/i2c/imx258.yaml b/Documentation/devicetree/bindings/media/i2c/imx258.yaml
> index 515317eff41a..cde0f7383b2a 100644
> --- a/Documentation/devicetree/bindings/media/i2c/imx258.yaml
> +++ b/Documentation/devicetree/bindings/media/i2c/imx258.yaml
> @@ -49,7 +49,7 @@ properties:
>
> # See ../video-interfaces.txt for more details
> port:
> - $ref: /schemas/graph.yaml#/properties/port
> + $ref: /schemas/graph.yaml#/$defs/port-base
> additionalProperties: false
>
> properties:
> diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
> index 9149f5685688..246dc5fec716 100644
> --- a/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
> +++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
> @@ -45,7 +45,7 @@ properties:
>
> port:
> description: MIPI CSI-2 transmitter port
> - $ref: /schemas/graph.yaml#/properties/port
> + $ref: /schemas/graph.yaml#/$defs/port-base
> additionalProperties: false
>
> properties:
> diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
> index 0699c7e4fdeb..b962863e4f65 100644
> --- a/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
> +++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
> @@ -45,7 +45,7 @@ properties:
>
> port:
> description: MIPI CSI-2 transmitter port
> - $ref: /schemas/graph.yaml#/properties/port
> + $ref: /schemas/graph.yaml#/$defs/port-base
> additionalProperties: false
>
> properties:
> diff --git a/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml b/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
> index 27cc5b7ff613..f5055b9db693 100644
> --- a/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
> +++ b/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
> @@ -37,7 +37,7 @@ properties:
>
> port:
> additionalProperties: false
> - $ref: /schemas/graph.yaml#/properties/port
> + $ref: /schemas/graph.yaml#/$defs/port-base
>
> properties:
> endpoint:
> diff --git a/Documentation/devicetree/bindings/media/renesas,vin.yaml b/Documentation/devicetree/bindings/media/renesas,vin.yaml
> index dd1a5ce5896c..4945a2f0eca6 100644
> --- a/Documentation/devicetree/bindings/media/renesas,vin.yaml
> +++ b/Documentation/devicetree/bindings/media/renesas,vin.yaml
> @@ -118,7 +118,8 @@ properties:
>
> properties:
> port@0:
> - $ref: /schemas/graph.yaml#/properties/port
> + $ref: /schemas/graph.yaml#/$defs/port-base
> + unevaluatedProperties: false
> description:
> Input port node, single endpoint describing a parallel input source.
>
> --
> 2.27.0
>

--
Regards,
Niklas S?derlund

2021-07-01 14:08:44

by Rob Herring (Arm)

Subject: Re: [PATCH] dt-bindings: Fix 'unevaluatedProperties' errors in DT graph users

On Wed, 23 Jun 2021 10:43:44 -0600, Rob Herring wrote:
> In testing out under development json-schema 2020-12 support, there's a
> few issues with 'unevaluatedProperties' and the graph schema. If
> 'graph.yaml#/properties/port' is used, then neither the port nor the
> endpoint(s) can have additional properties. 'graph.yaml#/$defs/port-base'
> needs to be used instead.
>
> Cc: Sakari Ailus <[email protected]>
> Cc: Mauro Carvalho Chehab <[email protected]>
> Cc: "Paul J. Murphy" <[email protected]>
> Cc: Daniele Alessandrelli <[email protected]>
> Cc: "Niklas S?derlund" <[email protected]>
> Cc: Krzysztof Kozlowski <[email protected]>
> Cc: Paul Kocialkowski <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Rob Herring <[email protected]>
> ---
> .../devicetree/bindings/display/bridge/lontium,lt8912b.yaml | 3 ++-
> Documentation/devicetree/bindings/media/i2c/imx258.yaml | 2 +-
> Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml | 2 +-
> Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml | 2 +-
> Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml | 2 +-
> Documentation/devicetree/bindings/media/renesas,vin.yaml | 3 ++-
> 6 files changed, 8 insertions(+), 6 deletions(-)
>

Applied, thanks!