diff options
author | Jason Cooper <jason@lakedaemon.net> | 2013-08-07 20:17:36 +0000 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-08-07 20:17:36 +0000 |
commit | 65ecab715d80150acf55d9a5bea0bd0749b43c58 (patch) | |
tree | d66e05959177e178ef13eec19962e6b1c0951f71 /Documentation/devicetree | |
parent | 2a7b6d5c94c655358cc3da11efc49d8a8bf5326b (diff) | |
parent | 6885c36c4d64c3c7b993754221650a96e91d6a38 (diff) |
Merge branch 'mvebu/msi_irq' into for-next
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt b/Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt index 61df564c0d23..d74091a8a3bf 100644 --- a/Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt +++ b/Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt @@ -4,6 +4,8 @@ Marvell Armada 370 and Armada XP Interrupt Controller Required properties: - compatible: Should be "marvell,mpic" - interrupt-controller: Identifies the node as an interrupt controller. +- msi-controller: Identifies the node as an PCI Message Signaled + Interrupt controller. - #interrupt-cells: The number of cells to define the interrupts. Should be 1. The cell is the IRQ number @@ -24,6 +26,7 @@ Example: #address-cells = <1>; #size-cells = <1>; interrupt-controller; + msi-controller; reg = <0xd0020a00 0x1d0>, <0xd0021070 0x58>; }; |