Include generic interrupt-controller.yaml and msi-controller.yaml
schema, which enforces node naming and other generic properties.
The schema requires now proper naming of node.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../bindings/interrupt-controller/ti,pruss-intc.yaml | 5 ++++-
.../bindings/interrupt-controller/ti,sci-inta.yaml | 1 +
.../bindings/interrupt-controller/ti,sci-intr.yaml | 3 ++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,pruss-intc.yaml b/Documentation/devicetree/bindings/interrupt-controller/ti,pruss-intc.yaml
index 65523d9459d8..983d10da4463 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/ti,pruss-intc.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,pruss-intc.yaml
@@ -32,6 +32,9 @@ description: |
This interrupt-controller node should be defined as a child node of the
corresponding PRUSS node. The node should be named "interrupt-controller".
+allOf:
+ - $ref: /schemas/interrupt-controller.yaml#
+
properties:
$nodename:
pattern: "^interrupt-controller@[0-9a-f]+$"
@@ -106,7 +109,7 @@ required:
- interrupt-controller
- "#interrupt-cells"
-additionalProperties: false
+unevaluatedProperties: false
examples:
- |
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
index 88c46e61732e..935a61504aa0 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
@@ -11,6 +11,7 @@ maintainers:
allOf:
- $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
+ - $ref: msi-controller.yaml#
description: |
The Interrupt Aggregator (INTA) provides a centralized machine
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
index e12aee42b126..0d35a5e21a64 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
@@ -11,6 +11,7 @@ maintainers:
allOf:
- $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
+ - $ref: /schemas/interrupt-controller.yaml#
description: |
The Interrupt Router (INTR) module provides a mechanism to mux M
@@ -92,7 +93,7 @@ unevaluatedProperties: false
examples:
- |
- main_gpio_intr: interrupt-controller0 {
+ main_gpio_intr: interrupt-controller {
compatible = "ti,sci-intr";
ti,intr-trigger-type = <1>;
interrupt-controller;
--
2.32.0
On 12:57-20220317, Krzysztof Kozlowski wrote:
> Include generic interrupt-controller.yaml and msi-controller.yaml
> schema, which enforces node naming and other generic properties.
> The schema requires now proper naming of node.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
Reviewed-by: Nishanth Menon <[email protected]>
Thanks.
[...]
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D