Skip to contentSkip to conversation

dt-bindings: ti,k3: Use common ti,k3-sci-common.yaml schema

PATCH Applied Rob Herring 2 participants 3 messages Jan 25, 2023 – Feb 2, 2023

Subsystems (3)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: ti,k3: Use common ti,k3-sci-common.yaml schema

Instead of redefining the 'ti,sci' and 'ti,sci-dev-id' properties multiple times, reference the common schema where they are defined. Most cases using these properties already do this, just udma and ringacc need to be fixed.

---
 .../devicetree/bindings/dma/ti/k3-udma.yaml         |  9 +--------
 .../devicetree/bindings/soc/ti/k3-ringacc.yaml      | 13 ++++---------
 2 files changed, 5 insertions(+), 17 deletions(-)
Documentation/devicetree/bindings/dma/ti/k3-udma.yaml +1 -8
index 7ff428ad3aae..97f6ae9b1236 100644
@@ -44,6 +44,7 @@ description: |
 
 allOf:
   - $ref: "../dma-controller.yaml#"
+  - $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
 
 properties:
   "#dma-cells":
@@ -78,14 +79,6 @@ properties:
 
   msi-parent: true
 
-  ti,sci:
-    description: phandle to TI-SCI compatible System controller node
-    $ref: /schemas/types.yaml#/definitions/phandle
-
-  ti,sci-dev-id:
-    description: TI-SCI device id of UDMAP
-    $ref: /schemas/types.yaml#/definitions/uint32
-
   ti,ringacc:
     description: phandle to the ring accelerator node
     $ref: /schemas/types.yaml#/definitions/phandle
Documentation/devicetree/bindings/soc/ti/k3-ringacc.yaml +4 -9
index ddea3d41971d..22cf9002fee7 100644
@@ -25,6 +25,9 @@ description: |
   The Ring Accelerator is a hardware module that is responsible for accelerating
   management of the packet queues. The K3 SoCs can have more than one RA instances
 
+allOf:
+  - $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
+
 properties:
   compatible:
     items:
@@ -54,14 +57,6 @@ properties:
     $ref: /schemas/types.yaml#/definitions/uint32
     description: TI-SCI RM subtype for GP ring range
 
-  ti,sci:
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    description: phandle on TI-SCI compatible System controller node
-
-  ti,sci-dev-id:
-    $ref: /schemas/types.yaml#/definitions/uint32
-    description: TI-SCI device id of the ring accelerator
-
 required:
   - compatible
   - reg
@@ -72,7 +67,7 @@ required:
   - ti,sci
   - ti,sci-dev-id
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
Signature · 1 line
2.39.0
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Rob Herring

Instead of redefining the 'ti,sci' and 'ti,sci-dev-id' properties multiple times, reference the common schema where they are defined. Most cases using these properties already do this, just udma and ringacc need to be fixed.

Quoted 72 lines
---
  .../devicetree/bindings/dma/ti/k3-udma.yaml         |  9 +--------
  .../devicetree/bindings/soc/ti/k3-ringacc.yaml      | 13 ++++---------
  2 files changed, 5 insertions(+), 17 deletions(-)
Documentation/devicetree/bindings/dma/ti/k3-udma.yaml +1 -8
index 7ff428ad3aae..97f6ae9b1236 100644
@@ -44,6 +44,7 @@ description: |
 
  allOf:
    - $ref: "../dma-controller.yaml#"
+  - $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
 
  properties:
    "#dma-cells":
@@ -78,14 +79,6 @@ properties:
 
    msi-parent: true
 
-  ti,sci:
-    description: phandle to TI-SCI compatible System controller node
-    $ref: /schemas/types.yaml#/definitions/phandle
-
-  ti,sci-dev-id:
-    description: TI-SCI device id of UDMAP
-    $ref: /schemas/types.yaml#/definitions/uint32
-
    ti,ringacc:
      description: phandle to the ring accelerator node
      $ref: /schemas/types.yaml#/definitions/phandle
Documentation/devicetree/bindings/soc/ti/k3-ringacc.yaml +4 -9
index ddea3d41971d..22cf9002fee7 100644
@@ -25,6 +25,9 @@ description: |
    The Ring Accelerator is a hardware module that is responsible for accelerating
    management of the packet queues. The K3 SoCs can have more than one RA instances
 
+allOf:
+  - $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
+
  properties:
    compatible:
      items:
@@ -54,14 +57,6 @@ properties:
      $ref: /schemas/types.yaml#/definitions/uint32
      description: TI-SCI RM subtype for GP ring range
 
-  ti,sci:
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    description: phandle on TI-SCI compatible System controller node
-
-  ti,sci-dev-id:
-    $ref: /schemas/types.yaml#/definitions/uint32
-    description: TI-SCI device id of the ring accelerator
-
  required:
    - compatible
    - reg
@@ -72,7 +67,7 @@ required:
    - ti,sci
    - ti,sci-dev-id
 
-additionalProperties: false
+unevaluatedProperties: false
 
  examples:
    - |
Signature · 1 line
Péter
author maintainer Applied
#2 lore raw
In reply to Rob Herring
Quoted 11 lines · Rob Herring

Instead of redefining the 'ti,sci' and 'ti,sci-dev-id' properties multiple times, reference the common schema where they are defined. Most cases using these properties already do this, just udma and ringacc need to be fixed.

---
 .../devicetree/bindings/dma/ti/k3-udma.yaml         |  9 +--------
 .../devicetree/bindings/soc/ti/k3-ringacc.yaml      | 13 ++++---------
 2 files changed, 5 insertions(+), 17 deletions(-)

Applied, thanks!