Skip to contentSkip to conversation

dt-bindings: Fix 'unevaluatedProperties' errors in DT graph users

PATCH Applied Rob Herring 3 participants 4 messages Jun 23, 2021 – Jul 1, 2021

Subsystems (8)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 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]>
---
 .../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(-)
Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml +2 -1
index 735d0233a7d6..674891ee2f8e 100644
@@ -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
 
Documentation/devicetree/bindings/media/i2c/imx258.yaml +1 -1
index 515317eff41a..cde0f7383b2a 100644
@@ -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:
Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml +1 -1
index 9149f5685688..246dc5fec716 100644
@@ -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:
Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml +1 -1
index 0699c7e4fdeb..b962863e4f65 100644
@@ -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:
Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml +1 -1
index 27cc5b7ff613..f5055b9db693 100644
@@ -37,7 +37,7 @@ properties:
 
   port:
     additionalProperties: false
-    $ref: /schemas/graph.yaml#/properties/port
+    $ref: /schemas/graph.yaml#/$defs/port-base
 
     properties:
       endpoint:
Documentation/devicetree/bindings/media/renesas,vin.yaml +2 -1
index dd1a5ce5896c..4945a2f0eca6 100644
@@ -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.
 
Signature · 1 line
2.27.0
Acked-by on v1 1/1
#1 lore raw
Quoted 17 lines · Rob Herring

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]>
Quoted 9 lines
---
 .../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(-)

Best regards,
Krzysztof

maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Rob Herring

Hi Rob,

Thanks for your work.

Quoted 17 lines · Rob Herring

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]>
Quoted 7 lines
---
 .../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

Quoted 85 lines
 6 files changed, 8 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml +2 -1
index 735d0233a7d6..674891ee2f8e 100644
@@ -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
 
Documentation/devicetree/bindings/media/i2c/imx258.yaml +1 -1
index 515317eff41a..cde0f7383b2a 100644
@@ -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:
Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml +1 -1
index 9149f5685688..246dc5fec716 100644
@@ -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:
Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml +1 -1
index 0699c7e4fdeb..b962863e4f65 100644
@@ -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:
Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml +1 -1
index 27cc5b7ff613..f5055b9db693 100644
@@ -37,7 +37,7 @@ properties:
 
   port:
     additionalProperties: false
-    $ref: /schemas/graph.yaml#/properties/port
+    $ref: /schemas/graph.yaml#/$defs/port-base
 
     properties:
       endpoint:
Documentation/devicetree/bindings/media/renesas,vin.yaml +2 -1
index dd1a5ce5896c..4945a2f0eca6 100644
@@ -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.
 
Signature · 1 line
2.27.0
Signature · 2 lines
Regards,
Niklas Söderlund
author maintainer Applied
#3 lore raw
In reply to Rob Herring
Quoted 17 lines · Rob Herring

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]>
Quoted 9 lines
---
 .../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!