[PATCH v2] media: dt-bindings: samsung,s5p-mfc: Fix iommu properties schemas

[PATCH v2] media: dt-bindings: samsung,s5p-mfc: Fix iommu properties schemas

[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".

Signed-off-by: Rob Herring <robh@kernel.org>
---
v2:
 - Fix some more cases of iommus-names
---
 .../bindings/media/samsung,s5p-mfc.yaml       | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml b/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml
index 084b44582a43..4c3250985ac3 100644
--- a/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml
+++ b/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml
@@ -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
-        iommus-names:
-          items:
-            - const: left
-            - const: right
+          minItems: 2
+        iommu-names:
+          minItems: 2
 
   - if:
       properties:
@@ -144,11 +142,9 @@ allOf:
           items:
             - const: mfc
         iommus:
-          maxItems: 2
-        iommus-names:
-          items:
-            - const: left
-            - const: right
+          minItems: 2
+        iommu-names:
+          minItems: 2
 
   - if:
       properties:
@@ -161,9 +157,6 @@ allOf:
         clocks:
           minItems: 1
           maxItems: 2
-        iommus:
-          minItems: 1
-          maxItems: 2
 
 examples:
   - |
-- 
2.43.0

RE: [PATCH v2] media: dt-bindings: samsung,s5p-mfc: Fix iommu properties schemas

[Aakarsh Jain]

> -----Original Message-----
> From: Rob Herring <robh@kernel.org>
> Sent: 15 December 2023 01:26
> To: Mauro Carvalho Chehab <mchehab@kernel.org>; Krzysztof Kozlowski
> <krzysztof.kozlowski+dt@linaro.org>; Conor Dooley
> <conor+dt@kernel.org>; Marek Szyprowski <m.szyprowski@samsung.com>;
> Aakarsh Jain <aakarsh.jain@samsung.com>
> Cc: linux-media@vger.kernel.org; devicetree@vger.kernel.org; linux-
> kernel@vger.kernel.org
> Subject: [PATCH v2] 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 <robh@kernel.org>
> ---
> v2:
>  - Fix some more cases of iommus-names
> ---
>  .../bindings/media/samsung,s5p-mfc.yaml       | 33 ++++++++-----------
>  1 file changed, 13 insertions(+), 20 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/media/samsung,s5p-
> mfc.yaml b/Documentation/devicetree/bindings/media/samsung,s5p-
> mfc.yaml
> index 084b44582a43..4c3250985ac3 100644
> --- a/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml
> +++ b/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml
> @@ -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
> -        iommus-names:
> -          items:
> -            - const: left
> -            - const: right
> +          minItems: 2
> +        iommu-names:
> +          minItems: 2
> 
>    - if:
>        properties:
> @@ -144,11 +142,9 @@ allOf:
>            items:
>              - const: mfc
>          iommus:
> -          maxItems: 2
> -        iommus-names:
> -          items:
> -            - const: left
> -            - const: right
> +          minItems: 2
> +        iommu-names:
> +          minItems: 2
> 
>    - if:
>        properties:
> @@ -161,9 +157,6 @@ allOf:
>          clocks:
>            minItems: 1
>            maxItems: 2
> -        iommus:
> -          minItems: 1
> -          maxItems: 2
> 
>  examples:
>    - |
> --
> 2.43.0

Reviewed-by: Aakarsh Jain <aakarsh.jain@samsung.com>

Re: [PATCH v2] media: dt-bindings: samsung,s5p-mfc: Fix iommu properties schemas

[Krzysztof Kozlowski]

On 14/12/2023 20:55, Rob Herring wrote:
> 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 <robh@kernel.org>
> ---

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH v2] media: dt-bindings: samsung,s5p-mfc: Fix iommu properties schemas

[Rob Herring]

On Thu, 14 Dec 2023 13:55:52 -0600, Rob Herring wrote:
> 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 <robh@kernel.org>
> ---
> v2:
>  - Fix some more cases of iommus-names
> ---
>  .../bindings/media/samsung,s5p-mfc.yaml       | 33 ++++++++-----------
>  1 file changed, 13 insertions(+), 20 deletions(-)
> 

Applied, thanks!