summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2014-10-02 13:03:48 +0000
committerJason Cooper <jason@lakedaemon.net>2014-10-02 13:03:48 +0000
commita778bf35bd928653a0d9c9313a56866be8aab59d (patch)
tree7a5d29423bc57ea62b28a90003f429cad0482e04 /Documentation
parent468a903c0e5147e3f93187f0b808a3ef957fd00e (diff)
parent20afdeb812da4097447eb324f34be11a10b11542 (diff)
downloadop-kernel-dev-a778bf35bd928653a0d9c9313a56866be8aab59d.zip
op-kernel-dev-a778bf35bd928653a0d9c9313a56866be8aab59d.tar.gz
Merge branch 'irqchip/atmel' into irqchip/core
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt b/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt
index 2742e9c..f292917f 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt
@@ -2,7 +2,7 @@
Required properties:
- compatible: Should be "atmel,<chip>-aic"
- <chip> can be "at91rm9200" or "sama5d3"
+ <chip> can be "at91rm9200", "sama5d3" or "sama5d4"
- interrupt-controller: Identifies the node as an interrupt controller.
- interrupt-parent: For single AIC system, it is an empty property.
- #interrupt-cells: The number of cells to define the interrupts. It should be 3.
OpenPOWER on IntegriCloud