Commit 8e7fe266 authored by Thomas Gleixner's avatar Thomas Gleixner

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
parents 143d36a3 725b06f3
...@@ -6,7 +6,9 @@ which can be used by on-board peripheral for MSI interrupts. ...@@ -6,7 +6,9 @@ which can be used by on-board peripheral for MSI interrupts.
Required properties: 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. - interrupt,controller : Identifies the node as an interrupt controller.
...@@ -29,7 +31,8 @@ Required properties: ...@@ -29,7 +31,8 @@ Required properties:
Example: Example:
odmi: odmi@300000 { odmi: odmi@300000 {
compatible = "marvell,odmi-controller"; compatible = "marvell,ap806-odm-controller",
"marvell,odmi-controller";
interrupt-controller; interrupt-controller;
msi-controller; msi-controller;
marvell,odmi-frames = <4>; marvell,odmi-frames = <4>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment