summaryrefslogtreecommitdiffstats
path: root/dts/Bindings/interrupt-controller
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-09-01 09:47:28 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-02 11:01:31 +0200
commit93a6c6a80838bba92c1769e1b381be426b4fd1d8 (patch)
tree6f1ed3a0ab206fface4869e48052c1702c21b64c /dts/Bindings/interrupt-controller
parenta595ff6eea05b919567f96d71e7e2c7b6236b8ac (diff)
downloadbarebox-93a6c6a80838bba92c1769e1b381be426b4fd1d8.tar.gz
barebox-93a6c6a80838bba92c1769e1b381be426b4fd1d8.tar.xz
dts: update to v3.17-rc2
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/Bindings/interrupt-controller')
-rw-r--r--dts/Bindings/interrupt-controller/interrupts.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/dts/Bindings/interrupt-controller/interrupts.txt b/dts/Bindings/interrupt-controller/interrupts.txt
index 1486497a24..ce6a1a0720 100644
--- a/dts/Bindings/interrupt-controller/interrupts.txt
+++ b/dts/Bindings/interrupt-controller/interrupts.txt
@@ -4,11 +4,13 @@ Specifying interrupt information for devices
1) Interrupt client nodes
-------------------------
-Nodes that describe devices which generate interrupts must contain an either an
-"interrupts" property or an "interrupts-extended" property. These properties
-contain a list of interrupt specifiers, one per output interrupt. The format of
-the interrupt specifier is determined by the interrupt controller to which the
-interrupts are routed; see section 2 below for details.
+Nodes that describe devices which generate interrupts must contain an
+"interrupts" property, an "interrupts-extended" property, or both. If both are
+present, the latter should take precedence; the former may be provided simply
+for compatibility with software that does not recognize the latter. These
+properties contain a list of interrupt specifiers, one per output interrupt. The
+format of the interrupt specifier is determined by the interrupt controller to
+which the interrupts are routed; see section 2 below for details.
Example:
interrupt-parent = <&intc1>;