[PATCH] dt-bindings: media: renesas,vin: Make resets optional on R-Car Gen1

[PATCH] dt-bindings: media: renesas,vin: Make resets optional on R-Car Gen1

[Geert Uytterhoeven]

The "resets" property is not present on R-Car Gen1 SoCs.
Supporting it would require migrating from renesas,cpg-clocks to
renesas,cpg-mssr.

Fixes: 905fc6b1bfb4a631 ("dt-bindings: rcar-vin: Convert bindings to json-schema")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Note that VIN is not yet enabled in r8a777[89].dtsi.
---
 .../bindings/media/renesas,vin.yaml           | 46 ++++++++++++-------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/renesas,vin.yaml b/Documentation/devicetree/bindings/media/renesas,vin.yaml
index 79c936b313ea91ae..19fccc2fd8ece120 100644
--- a/Documentation/devicetree/bindings/media/renesas,vin.yaml
+++ b/Documentation/devicetree/bindings/media/renesas,vin.yaml
@@ -194,23 +194,35 @@ required:
   - interrupts
   - clocks
   - power-domains
-  - resets
-
-if:
-  properties:
-    compatible:
-      contains:
-        enum:
-          - renesas,vin-r8a7778
-          - renesas,vin-r8a7779
-          - renesas,rcar-gen2-vin
-then:
-  required:
-    - port
-else:
-  required:
-    - renesas,id
-    - ports
+
+allOf:
+  - if:
+      not:
+        properties:
+          compatible:
+            contains:
+              enum:
+                - renesas,vin-r8a7778
+                - renesas,vin-r8a7779
+    then:
+      required:
+        - resets
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - renesas,vin-r8a7778
+              - renesas,vin-r8a7779
+              - renesas,rcar-gen2-vin
+    then:
+      required:
+        - port
+    else:
+      required:
+        - renesas,id
+        - ports
 
 additionalProperties: false
 
-- 
2.25.1

Re: [PATCH] dt-bindings: media: renesas,vin: Make resets optional on R-Car Gen1

[Niklas Söderlund]

Hi Geert,

On 2021-04-29 14:45:52 +0200, Geert Uytterhoeven wrote:
> The "resets" property is not present on R-Car Gen1 SoCs.
> Supporting it would require migrating from renesas,cpg-clocks to
> renesas,cpg-mssr.
> 
> Fixes: 905fc6b1bfb4a631 ("dt-bindings: rcar-vin: Convert bindings to json-schema")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

> ---
> Note that VIN is not yet enabled in r8a777[89].dtsi.
> ---
>  .../bindings/media/renesas,vin.yaml           | 46 ++++++++++++-------
>  1 file changed, 29 insertions(+), 17 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/media/renesas,vin.yaml b/Documentation/devicetree/bindings/media/renesas,vin.yaml
> index 79c936b313ea91ae..19fccc2fd8ece120 100644
> --- a/Documentation/devicetree/bindings/media/renesas,vin.yaml
> +++ b/Documentation/devicetree/bindings/media/renesas,vin.yaml
> @@ -194,23 +194,35 @@ required:
>    - interrupts
>    - clocks
>    - power-domains
> -  - resets
> -
> -if:
> -  properties:
> -    compatible:
> -      contains:
> -        enum:
> -          - renesas,vin-r8a7778
> -          - renesas,vin-r8a7779
> -          - renesas,rcar-gen2-vin
> -then:
> -  required:
> -    - port
> -else:
> -  required:
> -    - renesas,id
> -    - ports
> +
> +allOf:
> +  - if:
> +      not:
> +        properties:
> +          compatible:
> +            contains:
> +              enum:
> +                - renesas,vin-r8a7778
> +                - renesas,vin-r8a7779
> +    then:
> +      required:
> +        - resets
> +
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            enum:
> +              - renesas,vin-r8a7778
> +              - renesas,vin-r8a7779
> +              - renesas,rcar-gen2-vin
> +    then:
> +      required:
> +        - port
> +    else:
> +      required:
> +        - renesas,id
> +        - ports
>  
>  additionalProperties: false
>  
> -- 
> 2.25.1
> 

-- 
Regards,
Niklas Söderlund

Re: [PATCH] dt-bindings: media: renesas,vin: Make resets optional on R-Car Gen1

[Rob Herring]

On Thu, 29 Apr 2021 14:45:52 +0200, Geert Uytterhoeven wrote:
> The "resets" property is not present on R-Car Gen1 SoCs.
> Supporting it would require migrating from renesas,cpg-clocks to
> renesas,cpg-mssr.
> 
> Fixes: 905fc6b1bfb4a631 ("dt-bindings: rcar-vin: Convert bindings to json-schema")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> Note that VIN is not yet enabled in r8a777[89].dtsi.
> ---
>  .../bindings/media/renesas,vin.yaml           | 46 ++++++++++++-------
>  1 file changed, 29 insertions(+), 17 deletions(-)
> 

Applied, thanks!