media: dt-bindings: qcom,venus: split common properties

All Qualcomm SoC Venus bindings share a lot of properties, so split common part to re-usable schema to reduce the duplication and promote unified style. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

media: dt-bindings: qcom,venus: split common properties
All Qualcomm SoC Venus bindings share a lot of properties, so split common part to re-usable schema to reduce the duplication and promote unified style. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
f8cc21d4 · Krzysztof Kozlowski · Mauro Carvalho Chehab · af2270e0 · f8cc21d4 · f8cc21d4
Commit f8cc21d4 authored Dec 27, 2022 by Krzysztof Kozlowski Committed by Mauro Carvalho Chehab Mar 20, 2023
9 changed files
--- a/Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml
@@ -13,16 +13,13 @@ description: |
  The Venus IP is a video encode and decode accelerator present
  on Qualcomm platforms

+allOf:
+  - $ref: qcom,venus-common.yaml#
+
 properties:
  compatible:
    const: qcom,msm8916-venus

-  reg:
-    maxItems: 1
-
-  interrupts:
-    maxItems: 1
-
  power-domains:
    maxItems: 1

@@ -38,9 +35,6 @@ properties:
  iommus:
    maxItems: 1

-  memory-region:
-    maxItems: 1
-
  video-decoder:
    type: object

@@ -65,34 +59,13 @@ properties:

    additionalProperties: false

-  video-firmware:
-    type: object
-    additionalProperties: false
-
-    description: |
-      Firmware subnode is needed when the platform does not
-      have TrustZone.
-
-    properties:
-      iommus:
-        maxItems: 1
-
-    required:
-      - iommus
-
 required:
  - compatible
-  - reg
-  - interrupts
-  - power-domains
-  - clocks
-  - clock-names
  - iommus
-  - memory-region
  - video-decoder
  - video-encoder

-additionalProperties: false
+unevaluatedProperties: false

 examples:
  - |

--- a/Documentation/devicetree/bindings/media/qcom,msm8996-venus.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,msm8996-venus.yaml
@@ -13,16 +13,13 @@ description: |
  The Venus IP is a video encode and decode accelerator present
  on Qualcomm platforms

+allOf:
+  - $ref: qcom,venus-common.yaml#
+
 properties:
  compatible:
    const: qcom,msm8996-venus

-  reg:
-    maxItems: 1
-
-  interrupts:
-    maxItems: 1
-
  power-domains:
    maxItems: 1

@@ -39,9 +36,6 @@ properties:
  iommus:
    maxItems: 20

-  memory-region:
-    maxItems: 1
-
  video-decoder:
    type: object

@@ -92,34 +86,13 @@ properties:

    additionalProperties: false

-  video-firmware:
-    type: object
-    additionalProperties: false
-
-    description: |
-      Firmware subnode is needed when the platform does not
-      have TrustZone.
-
-    properties:
-      iommus:
-        maxItems: 1
-
-    required:
-      - iommus
-
 required:
  - compatible
-  - reg
-  - interrupts
-  - power-domains
-  - clocks
-  - clock-names
  - iommus
-  - memory-region
  - video-decoder
  - video-encoder

-additionalProperties: false
+unevaluatedProperties: false

 examples:
  - |

--- a/Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml
@@ -13,16 +13,13 @@ description: |
  The Venus IP is a video encode and decode accelerator present
  on Qualcomm platforms

+allOf:
+  - $ref: qcom,venus-common.yaml#
+
 properties:
  compatible:
    const: qcom,sc7180-venus

-  reg:
-    maxItems: 1
-
-  interrupts:
-    maxItems: 1
-
  power-domains:
    minItems: 2
    maxItems: 3
@@ -83,35 +80,14 @@ properties:

    additionalProperties: false

-  video-firmware:
-    type: object
-    additionalProperties: false
-
-    description: |
-      Firmware subnode is needed when the platform does not
-      have TrustZone.
-
-    properties:
-      iommus:
-        maxItems: 1
-
-    required:
-      - iommus
-
 required:
  - compatible
-  - reg
-  - interrupts
-  - power-domains
  - power-domain-names
-  - clocks
-  - clock-names
  - iommus
-  - memory-region
  - video-decoder
  - video-encoder

-additionalProperties: false
+unevaluatedProperties: false

 examples:
  - |

--- a/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml
@@ -13,16 +13,13 @@ description: |
  The Venus Iris2 IP is a video encode and decode accelerator present
  on Qualcomm platforms

+allOf:
+  - $ref: qcom,venus-common.yaml#
+
 properties:
  compatible:
    const: qcom,sc7280-venus

-  reg:
-    maxItems: 1
-
-  interrupts:
-    maxItems: 1
-
  power-domains:
    minItems: 2
    maxItems: 3
@@ -48,9 +45,6 @@ properties:
  iommus:
    maxItems: 2

-  memory-region:
-    maxItems: 1
-
  interconnects:
    maxItems: 2

@@ -83,35 +77,14 @@ properties:

    additionalProperties: false

-  video-firmware:
-    type: object
-    additionalProperties: false
-
-    description: |
-      Firmware subnode is needed when the platform does not
-      have TrustZone.
-
-    properties:
-      iommus:
-        maxItems: 1
-
-    required:
-      - iommus
-
 required:
  - compatible
-  - reg
-  - interrupts
-  - power-domains
  - power-domain-names
-  - clocks
-  - clock-names
  - iommus
-  - memory-region
  - video-decoder
  - video-encoder

-additionalProperties: false
+unevaluatedProperties: false

 examples:
  - |

--- a/Documentation/devicetree/bindings/media/qcom,sdm660-venus.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,sdm660-venus.yaml
@@ -14,13 +14,13 @@ description: |
  The Venus IP is a video encode and decode accelerator present
  on Qualcomm platforms

+allOf:
+  - $ref: qcom,venus-common.yaml#
+
 properties:
  compatible:
    const: qcom,sdm660-venus

-  reg:
-    maxItems: 1
-
  clocks:
    maxItems: 4

@@ -39,15 +39,9 @@ properties:
      - const: cpu-cfg
      - const: video-mem

-  interrupts:
-    maxItems: 1
-
  iommus:
    maxItems: 20

-  memory-region:
-    maxItems: 1
-
  power-domains:
    maxItems: 1

@@ -101,34 +95,13 @@ properties:

    additionalProperties: false

-  video-firmware:
-    type: object
-    additionalProperties: false
-
-    description: |
-      Firmware subnode is needed when the platform does not
-      have TrustZone.
-
-    properties:
-      iommus:
-        maxItems: 1
-
-    required:
-      - iommus
-
 required:
  - compatible
-  - reg
-  - clocks
-  - clock-names
-  - interrupts
  - iommus
-  - memory-region
-  - power-domains
  - video-decoder
  - video-encoder

-additionalProperties: false
+unevaluatedProperties: false

 examples:
  - |

--- a/Documentation/devicetree/bindings/media/qcom,sdm845-venus-v2.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,sdm845-venus-v2.yaml
@@ -13,16 +13,13 @@ description: |
  The Venus IP is a video encode and decode accelerator present
  on Qualcomm platforms

+allOf:
+  - $ref: qcom,venus-common.yaml#
+
 properties:
  compatible:
    const: qcom,sdm845-venus-v2

-  reg:
-    maxItems: 1
-
-  interrupts:
-    maxItems: 1
-
  power-domains:
    minItems: 3
    maxItems: 4
@@ -51,9 +48,6 @@ properties:
  iommus:
    maxItems: 2

-  memory-region:
-    maxItems: 1
-
  video-core0:
    type: object

@@ -78,35 +72,14 @@ properties:

    additionalProperties: false

-  video-firmware:
-    type: object
-    additionalProperties: false
-
-    description: |
-      Firmware subnode is needed when the platform does not
-      have TrustZone.
-
-    properties:
-      iommus:
-        maxItems: 1
-
-    required:
-      - iommus
-
 required:
  - compatible
-  - reg
-  - interrupts
-  - power-domains
  - power-domain-names
-  - clocks
-  - clock-names
  - iommus
-  - memory-region
  - video-core0
  - video-core1

-additionalProperties: false
+unevaluatedProperties: false

 examples:
  - |

--- a/Documentation/devicetree/bindings/media/qcom,sdm845-venus.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,sdm845-venus.yaml
@@ -13,16 +13,13 @@ description: |
  The Venus IP is a video encode and decode accelerator present
  on Qualcomm platforms

+allOf:
+  - $ref: qcom,venus-common.yaml#
+
 properties:
  compatible:
    const: qcom,sdm845-venus

-  reg:
-    maxItems: 1
-
-  interrupts:
-    maxItems: 1
-
  power-domains:
    maxItems: 1

@@ -38,9 +35,6 @@ properties:
  iommus:
    maxItems: 2

-  memory-region:
-    maxItems: 1
-
  video-core0:
    type: object

@@ -93,34 +87,13 @@ properties:

    additionalProperties: false

-  video-firmware:
-    type: object
-    additionalProperties: false
-
-    description: |
-      Firmware subnode is needed when the platform does not
-      have TrustZone.
-
-    properties:
-      iommus:
-        maxItems: 1
-
-    required:
-      - iommus
-
 required:
  - compatible
-  - reg
-  - interrupts
-  - power-domains
-  - clocks
-  - clock-names
  - iommus
-  - memory-region
  - video-core0
  - video-core1

-additionalProperties: false
+unevaluatedProperties: false

 examples:
  - |

--- a/Documentation/devicetree/bindings/media/qcom,sm8250-venus.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,sm8250-venus.yaml
@@ -13,16 +13,13 @@ description: |
  The Venus IP is a video encode and decode accelerator present
  on Qualcomm platforms

+allOf:
+  - $ref: qcom,venus-common.yaml#
+
 properties:
  compatible:
    const: qcom,sm8250-venus

-  reg:
-    maxItems: 1
-
-  interrupts:
-    maxItems: 1
-
  power-domains:
    minItems: 2
    maxItems: 3
@@ -46,9 +43,6 @@ properties:
  iommus:
    maxItems: 1

-  memory-region:
-    maxItems: 1
-
  interconnects:
    maxItems: 2

@@ -89,39 +83,18 @@ properties:

    additionalProperties: false

-  video-firmware:
-    type: object
-    additionalProperties: false
-
-    description: |
-      Firmware subnode is needed when the platform does not
-      have TrustZone.
-
-    properties:
-      iommus:
-        maxItems: 1
-
-    required:
-      - iommus
-
 required:
  - compatible
-  - reg
-  - interrupts
-  - power-domains
  - power-domain-names
-  - clocks
-  - clock-names
  - interconnects
  - interconnect-names
  - iommus
-  - memory-region
  - resets
  - reset-names
  - video-decoder
  - video-encoder

-additionalProperties: false
+unevaluatedProperties: false

 examples:
  - |

--- a/Documentation/devicetree/bindings/media/qcom,venus-common.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,venus-common.yaml
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/qcom,venus-common.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm SoC Venus Video Encode and Decode Accelerators Common Properties
+
+maintainers:
+  - Stanimir Varbanov <stanimir.k.varbanov@gmail.com>
+  - Vikash Garodia <quic_vgarodia@quicinc.com>
+
+description: |
+  The Venus IP is a video encode and decode accelerator present
+  on Qualcomm platforms
+
+properties:
+  reg:
+    maxItems: 1
+
+  clocks:
+    minItems: 3
+    maxItems: 7
+
+  clock-names:
+    minItems: 3
+    maxItems: 7
+
+  interrupts:
+    maxItems: 1
+
+  iommus:
+    minItems: 1
+    maxItems: 20
+
+  memory-region:
+    maxItems: 1
+
+  power-domains:
+    minItems: 1
+    maxItems: 4
+
+  power-domain-names:
+    minItems: 1
+    maxItems: 4
+
+  video-firmware:
+    type: object
+    additionalProperties: false
+
+    description: |
+      Firmware subnode is needed when the platform does not
+      have TrustZone.
+
+    properties:
+      iommus:
+        maxItems: 1
+
+    required:
+      - iommus
+
+required:
+  - reg
+  - clocks
+  - clock-names
+  - interrupts
+  - memory-region
+  - power-domains
+
+additionalProperties: true