diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-03-14 10:40:29 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-03-14 10:40:29 +0300 |
| commit | 8e7fe2660d4a98255a2741c64b64e3961d020bf5 (patch) | |
| tree | c5a6628825991d16fa624b30da852ba015af9890 /Documentation | |
| parent | 143d36a33b4d59a56bb8e913a17a105578fd3237 (diff) | |
| parent | 725b06f33d2a4f66ee84604b02f01b46614c82bc (diff) | |
| download | linux-8e7fe2660d4a98255a2741c64b64e3961d020bf5.tar.xz | |
Merge tag 'irqchip-core-4.6-3' of git://git.infradead.org/users/jcooper/linux into irq/core
Pull irqchip core changes from Jason Cooper:
- mvebu: Update dt binding docs for new odmi driver
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>; |