diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 14:16:20 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 14:16:20 +0300 |
| commit | 4e8dbe9e93436bcf326adbab7f9761dd8e4ecbfc (patch) | |
| tree | 128f3a2a1cc33dddc3a0522185acb48d12c1b6ee /Documentation/devicetree | |
| parent | ef0bf620e9b81845368b9c72ffdbd6834e424526 (diff) | |
| parent | a27d21e03eb14a63dae12467a7655be3334ac80c (diff) | |
| download | linux-4e8dbe9e93436bcf326adbab7f9761dd8e4ecbfc.tar.xz | |
Merge branch 'irq/gic-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull the GIC related updates from Marc Zyngier:
"Not a lot this time (what a relief!), but an interesting series from
Linus Walleij coming out of his work converting the ARM RealView
platforms to DT, and a couple of mundane fixes."
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt b/Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt index cc56021eb60b..5a1cb4bc3dfe 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt @@ -18,6 +18,7 @@ Main node required properties: "arm,cortex-a9-gic" "arm,gic-400" "arm,pl390" + "arm,tc11mp-gic" "brcm,brahma-b15-gic" "qcom,msm-8660-qgic" "qcom,msm-qgic2" |