diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2016-03-13 20:38:08 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2016-03-13 20:38:08 +0000 |
| commit | 725b06f33d2a4f66ee84604b02f01b46614c82bc (patch) | |
| tree | 41a7725821ea61a59a6ddcc6d4d364b1243c3a37 /Documentation | |
| parent | 1ad9a57633e407f40a288ed1d8660fe06446a002 (diff) | |
| parent | b009b096c473669311612a05b1dc2057e0ef256c (diff) | |
| download | linux-725b06f33d2a4f66ee84604b02f01b46614c82bc.tar.bz2 | |
Merge branch 'irqchip/mvebu' into irqchip/core
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt b/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt index 252d5c9c31f9..8af0a8e613ab 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt @@ -6,7 +6,9 @@ which can be used by on-board peripheral for MSI interrupts. Required properties: -- compatible : The value here should contain "marvell,odmi-controller". +- compatible : The value here should contain: + + "marvell,ap806-odmi-controller", "marvell,odmi-controller". - interrupt,controller : Identifies the node as an interrupt controller. @@ -29,7 +31,8 @@ Required properties: Example: odmi: odmi@300000 { - compatible = "marvell,odmi-controller"; + compatible = "marvell,ap806-odm-controller", + "marvell,odmi-controller"; interrupt-controller; msi-controller; marvell,odmi-frames = <4>; |