Skip to contentSkip to conversation

media: dt-bindings: samsung,s5p-mfc: Fix iommu properties schemas

PATCH Superseded Rob Herring 2 participants 3 messages Dec 13, 2023 – Dec 14, 2023

Subsystems (3)
Device tree bindings Media (V4L/DVB) Arm/Samsung S5P series Multi Format Codec (mfc) support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 media: dt-bindings: samsung,s5p-mfc: Fix iommu properties schemas

The iommus and iommu-names property schemas have several issues. First, 'iommus-names' in the if/then schemas is the wrong name. As all the names are the same, they can be defined at the top level instead. Then the if/then schemas just need to define how many entries. The iommus if/then schemas are also redundant. Best I can tell, the desire was to require 2 entries for "samsung,exynos5433-mfc", "samsung,mfc-v5", "samsung,mfc-v6", and "samsung,mfc-v8".

Signed-off-by Rob Herring <[email protected]>
---
 .../bindings/media/samsung,s5p-mfc.yaml       | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)
Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml +11 -18
index 084b44582a43..a970d80692d3 100644
@@ -49,7 +49,9 @@ properties:
 
   iommu-names:
     minItems: 1
-    maxItems: 2
+    items:
+      - const: left
+      - const: right
 
   power-domains:
     maxItems: 1

@@ -84,7 +86,7 @@ allOf:
             - const: sclk_mfc
         iommus:
           maxItems: 1
-        iommus-names: false
+        iommu-names: false
 
   - if:
       properties:

@@ -102,11 +104,9 @@ allOf:
             - const: aclk
             - const: aclk_xiu
         iommus:
-          maxItems: 2
-        iommus-names:
-          items:
-            - const: left
-            - const: right
+          minItems: 2
+        iommu-names:
+          minItems: 2
 
   - if:
       properties:

@@ -123,11 +123,9 @@ allOf:
             - const: mfc
             - const: sclk_mfc
         iommus:
-          maxItems: 2
+          minItems: 2
         iommus-names:
-          items:
-            - const: left
-            - const: right
+          minItems: 2
 
   - if:
       properties:

@@ -144,11 +142,9 @@ allOf:
           items:
             - const: mfc
         iommus:
-          maxItems: 2
+          minItems: 2
         iommus-names:
-          items:
-            - const: left
-            - const: right
+          minItems: 2
 
   - if:
       properties:

@@ -161,9 +157,6 @@ allOf:
         clocks:
           minItems: 1
           maxItems: 2
-        iommus:
-          minItems: 1
-          maxItems: 2
 
 examples:
   - |
Signature · 1 line
2.43.0
#1 lore raw
Quoted 8 lines · Rob Herring

The iommus and iommu-names property schemas have several issues. First, 'iommus-names' in the if/then schemas is the wrong name. As all the names are the same, they can be defined at the top level instead. Then the if/then schemas just need to define how many entries. The iommus if/then schemas are also redundant. Best I can tell, the desire was to require 2 entries for "samsung,exynos5433-mfc", "samsung,mfc-v5", "samsung,mfc-v6", and "samsung,mfc-v8".

...

Quoted 21 lines
Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml +4 -6
-        iommus-names: false
+        iommu-names: false
 
   - if:
       properties:

@@ -102,11 +104,9 @@ allOf:
             - const: aclk
             - const: aclk_xiu
         iommus:
-          maxItems: 2
-        iommus-names:
-          items:
-            - const: left
-            - const: right
+          minItems: 2
+        iommu-names:
+          minItems: 2
 
   - if:
       properties:

Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml allOf: · line 127

Quoted 6 lines
Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml +1 -1
@@ -123,11 +123,9 @@ allOf:
             - const: mfc
             - const: sclk_mfc
         iommus:
-          maxItems: 2
+          minItems: 2
         iommus-names:

Also here -> iommu-names

Quoted 8 lines
Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml +1 -3
-          items:
-            - const: left
-            - const: right
+          minItems: 2
 
   - if:
       properties:

Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml allOf: · line 146

Quoted 6 lines
Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml +1 -1
@@ -144,11 +142,9 @@ allOf:
           items:
             - const: mfc
         iommus:
-          maxItems: 2
+          minItems: 2
         iommus-names:

Also here

Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml allOf: · line 110

Quoted 5 lines
Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml +1 -3
-          items:
-            - const: left
-            - const: right
+          minItems: 2

Best regards,
Krzysztof

author maintainer
#2 lore raw
Quoted 31 lines · Krzysztof Kozlowski
Quoted 8 lines · Rob Herring

The iommus and iommu-names property schemas have several issues. First, 'iommus-names' in the if/then schemas is the wrong name. As all the names are the same, they can be defined at the top level instead. Then the if/then schemas just need to define how many entries. The iommus if/then schemas are also redundant. Best I can tell, the desire was to require 2 entries for "samsung,exynos5433-mfc", "samsung,mfc-v5", "samsung,mfc-v6", and "samsung,mfc-v8".

...

Quoted 18 lines
Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml +4 -6
-        iommus-names: false
+        iommu-names: false
 
   - if:
       properties:

@@ -102,11 +104,9 @@ allOf:
             - const: aclk
             - const: aclk_xiu
         iommus:
-          maxItems: 2
-        iommus-names:
-          items:
-            - const: left
-            - const: right
+          minItems: 2
+        iommu-names:
+          minItems: 2
Quoted 11 lines

Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml allOf: · line 127

Quoted 9 lines
Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml +1 -1
   - if:
       properties:

@@ -123,11 +123,9 @@ allOf:
             - const: mfc
             - const: sclk_mfc
         iommus:
-          maxItems: 2
+          minItems: 2
         iommus-names:

Also here -> iommu-names

Sigh. I got distracted with everything else that needed fixing.

Rob