Merge branch 'irqchip/mvebu' into irqchip/core

This commit is contained in:
Jason Cooper 2016-03-13 20:38:08 +00:00
commit 725b06f33d
1 changed files with 5 additions and 2 deletions

View File

@ -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:
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>;