!fixup: schemas

Kiciuk · Mar 29, 2024 · 64f1ef8 · 64f1ef8
1 parent 89df3bf
commit 64f1ef8
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 40 deletions.
diff --git a/Documentation/devicetree/bindings/display/msm/qcom,adreno-200.yaml b/Documentation/devicetree/bindings/display/msm/qcom,adreno-200.yaml
@@ -9,16 +9,15 @@ title: Adreno/Imageon 200 GPU
 
 maintainers:
   - Rob Clark <robdclark@gmail.com>
+
+description:
+  Adreno/Imageon 200 GPU
 
 properties:
   compatible:
-    oneOf:
-      - description: |
-          The driver is parsing the compat string for Imageon to
-          figure out the gpu-id and patch level.
-        items:
-          - pattern: '^amd,imageon-200\.[0-1]$'
-          - const: amd,imageon
+    items:
+      - pattern: '^amd,imageon-200\.[0-1]$'
+      - const: amd,imageon
 
   clocks:
     items: 
@@ -56,8 +55,6 @@ additionalProperties: false
 examples:
   - |
 
-    // Example imageon-200:
-
     #include <dt-bindings/clock/imx5-clock.h>
     #include <dt-bindings/interrupt-controller/irq.h>
 

diff --git a/Documentation/devicetree/bindings/display/msm/qcom,adreno-306.yaml b/Documentation/devicetree/bindings/display/msm/qcom,adreno-306.yaml
@@ -4,13 +4,13 @@
 $id: http://devicetree.org/schemas/display/msm/qcom,adreno-306.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Qualcomm Adreno 3xx GPU
+title: Qualcomm Adreno 306 GPU
 
 maintainers:
   - Rob Clark <robdclark@gmail.com>
 
 description:
-  Device tree bindings for Adreno 306 GPU.
+  Qualcomm Adreno 306 GPU
 
 select:
   properties:
@@ -59,23 +59,24 @@ properties:
       - const: gfx3d
 
   interconnects:
-    minItems: 1
-    maxItems: 2
+    maxItems: 1
 
   interconnect-names:
-    minItems: 1
-    maxItems: 2
+    items:
+      - const: gfx-mem
 
   interrupts:
     maxItems: 1
 
   iommus:
     items:
-      - description: Phandle to gpu smmu
+      - description: Phandle to not secure user context-bank
       - description: Phandle to not secure priv context-bank
 
   power-domains:
     maxItems: 1
+    items:
+      - description: OXILI power domain
 
   operating-points-v2: true
   opp-table:
@@ -97,7 +98,6 @@ unevaluatedProperties: false
 
 examples:
   - |
-    // Example a306 :
 
     #include <dt-bindings/clock/qcom,gcc-msm8916.h>
     #include <dt-bindings/power/qcom-rpmpd.h>

diff --git a/Documentation/devicetree/bindings/display/msm/qcom,adreno-330.yaml b/Documentation/devicetree/bindings/display/msm/qcom,adreno-330.yaml
@@ -4,20 +4,21 @@
 $id: http://devicetree.org/schemas/display/msm/qcom,adreno-330.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Qualcomm Adreno 3xx GPU
+title: Qualcomm Adreno 305/320/330 GPU
 
 maintainers:
   - Rob Clark <robdclark@gmail.com>
 
 description:
-  Device tree bindings for Adreno 330 GPU.
+  Qualcomm Adreno 305(MSM8226)/320(APQ8064)/330(MSM8974) GPU
 
 select:
   properties:
     compatible:
       contains:
         enum:
           - qcom,adreno-305.18
+          - qcom,adreno-320.2
           - qcom,adreno-330.1
   required:
     - compatible
@@ -31,6 +32,7 @@ properties:
     items:
       - enum:
           - qcom,adreno-305.18
+          - qcom,adreno-320.2
           - qcom,adreno-330.1
       - const: qcom,adreno
   reg:
@@ -67,7 +69,8 @@ properties:
     maxItems: 1
 
   interrupt-names:
-    maxItems: 1
+    items:
+      - const: kgsl_3d0_irq
 
   iommus:
     items:
@@ -80,13 +83,12 @@ properties:
     items:
       maxItems: 1
     description: |
-      phandles to one or more reserved on-chip SRAM regions.
-      phandle to the On Chip Memory (OCMEM) that's present on some a3xx and
-      a4xx Snapdragon SoCs. See
-      Documentation/devicetree/bindings/sram/qcom,ocmem.yaml
+      phandles to one or more reserved on-chip SRAM regions. 
+      See Documentation/devicetree/bindings/sram/qcom,ocmem.yaml
 
   power-domains:
-    maxItems: 1
+    items:
+      - description: OXILI power domain
 
   operating-points-v2: true
   opp-table:
@@ -105,11 +107,50 @@ required:
   - iommus
   - power-domains
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          items:
+            - enum:
+                - qcom,adreno-320.2
+            - const: qcom,adreno
+    then:
+      properties:
+        clocks:
+          items:
+            - description: GPU Core clock
+            - description: GPU Interface clock
+            - description: GPU Memory clock
+            - description: GPU Memory Interface clock
+
+        clock-names:
+          items:
+            - const: core
+            - const: iface
+            - const: mem
+            - const: mem_iface
+
+        power-domains: false
+
+        iommus:
+          minItems: 1
+          maxItems: 64
+
+      required:
+        - reg
+        - reg-names
+        - clocks
+        - clock-names
+        - interrupts
+        - interrupt-names
+        - iommus
+
+
 unevaluatedProperties: false
 
 examples:
   - |
-    // Example a330 :
 
     #include <dt-bindings/clock/qcom,gcc-msm8974.h>
     #include <dt-bindings/clock/qcom,mmcc-msm8974.h>

diff --git a/Documentation/devicetree/bindings/display/msm/qcom,adreno-405.yaml b/Documentation/devicetree/bindings/display/msm/qcom,adreno-405.yaml
@@ -10,7 +10,7 @@ maintainers:
   - Rob Clark <robdclark@gmail.com>
 
 description:
-  Device tree bindings for Adreno 405 GPU.
+  Adreno 405(MSM8939) GPU.
 
 select:
   properties:
@@ -75,7 +75,8 @@ properties:
       - description: Phandle to not secure priv context-bank
 
   power-domains:
-    maxItems: 1
+    items:
+      - description: OXILI power domain
 
   operating-points-v2: true
   opp-table:
@@ -104,7 +105,6 @@ unevaluatedProperties: false
 
 examples:
   - |
-    // Example a405 :
 
     #include <dt-bindings/clock/qcom,gcc-msm8939.h>
     #include <dt-bindings/power/qcom-rpmpd.h>

diff --git a/Documentation/devicetree/bindings/display/msm/qcom,adreno-506.yaml b/Documentation/devicetree/bindings/display/msm/qcom,adreno-506.yaml
@@ -4,13 +4,13 @@
 $id: http://devicetree.org/schemas/display/msm/qcom,adreno-506.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Qualcomm Adreno 506 GPU
+title: Qualcomm Adreno 504/505/506/510 GPU
 
 maintainers:
   - Rob Clark <robdclark@gmail.com>
 
 description:
-  Device tree bindings for Adreno 506 GPU.
+  Qualcomm Adreno 504/505/506/510 GPU
 
 select:
   properties:
@@ -79,7 +79,8 @@ properties:
       - description: Phandle to gpu smmu
 
   power-domains:
-    maxItems: 1
+    items:
+      - description: OXILI GX power domain
 
   operating-points-v2: true
   opp-table:
@@ -119,7 +120,7 @@ required:
   - iommus
   - power-domains
 
-unevaluatedProperties: false
+unevaluatedProperties: true
 
 examples:
   - |

diff --git a/Documentation/devicetree/bindings/display/msm/qcom,adreno-530.yaml b/Documentation/devicetree/bindings/display/msm/qcom,adreno-530.yaml
@@ -10,7 +10,7 @@ maintainers:
   - Rob Clark <robdclark@gmail.com>
 
 description:
-  Device tree bindings for Adreno 530 GPU.
+  Qualcomm Adreno 530 GPU
 
 select:
   properties:
@@ -71,7 +71,8 @@ properties:
       - description: Phandle to gpu smmu
 
   power-domains:
-    maxItems: 1
+    items:
+      - description: GPU GX power domain
 
   operating-points-v2: true
   opp-table:

diff --git a/Documentation/devicetree/bindings/display/msm/qcom,adreno-540.yaml b/Documentation/devicetree/bindings/display/msm/qcom,adreno-540.yaml
@@ -4,13 +4,13 @@
 $id: http://devicetree.org/schemas/display/msm/qcom,adreno-540.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Qualcomm Adreno 5xx GPU
+title: Qualcomm Adreno 508/512/540 GPU
 
 maintainers:
   - Rob Clark <robdclark@gmail.com>
 
 description:
-  Device tree bindings for Adreno 540 GPU.
+  Qualcomm Adreno 508/512/540 GPU
 
 select:
   properties:

diff --git a/Documentation/devicetree/bindings/display/msm/qcom,adreno-6xx.yaml b/Documentation/devicetree/bindings/display/msm/qcom,adreno-6xx.yaml
@@ -4,13 +4,13 @@
 $id: http://devicetree.org/schemas/display/msm/qcom,adreno-6xx.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Qualcomm Adreno 6xx GPU
+title: Qualcomm Adreno 600 series GPU
 
 maintainers:
   - Rob Clark <robdclark@gmail.com>
 
 description:
-  Device tree bindings for Adreno 600 series of GPU.
+  Qualcomm Adreno 600 series GPU
 
 select:
   properties:
@@ -213,4 +213,3 @@ examples:
             firmware-name = "qcom/LENOVO/81JL/qcdxkmsuc850.mbn";
         };
     };
-...