summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/interrupt-controller
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2020-05-13 11:29:57 +0100
committerRob Herring <robh@kernel.org>2020-05-14 22:16:08 -0500
commit61efb56e30f1c54ef3b6ca4b1598d01562979ef1 (patch)
treee33abea4815f4d1d62657b82ac9b7b26abf5f682 /Documentation/devicetree/bindings/interrupt-controller
parent0be4ae74881c96ae8ff718bcfb517415ab61a41e (diff)
downloadlinux-61efb56e30f1c54ef3b6ca4b1598d01562979ef1.tar.bz2
dt-bindings: arm: gic: Allow combining arm,gic-400 compatible strings
The arm,gic-400 compatible is probably the best matching string for the GIC in most modern SoCs, but was only introduced later into the kernel. For historic reasons and to keep compatibility, some SoC DTs were thus using a combination of this name and one of the older strings, which currently the binding denies. Add a stanza to the DT binding to allow "arm,gic-400", followed by either "arm,cortex-a15-gic" or "arm,cortex-a7-gic". This fixes binding compliance for quite some SoC .dtsi files in the kernel tree. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/interrupt-controller')
-rw-r--r--Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml b/Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml
index 9a47820ef346..3ab258c82930 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml
@@ -40,6 +40,12 @@ properties:
- qcom,msm-qgic2
- items:
+ - const: arm,gic-400
+ - enum:
+ - arm,cortex-a15-gic
+ - arm,cortex-a7-gic
+
+ - items:
- const: arm,arm1176jzf-devchip-gic
- const: arm,arm11mp-gic