Skip to content

Commit 8e7fe26

Browse files
committed
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
2 parents 143d36a + 725b06f commit 8e7fe26

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ which can be used by on-board peripheral for MSI interrupts.
66

77
Required properties:
88

9-
- compatible : The value here should contain "marvell,odmi-controller".
9+
- compatible : The value here should contain:
10+
11+
"marvell,ap806-odmi-controller", "marvell,odmi-controller".
1012

1113
- interrupt,controller : Identifies the node as an interrupt controller.
1214

@@ -29,7 +31,8 @@ Required properties:
2931
Example:
3032

3133
odmi: odmi@300000 {
32-
compatible = "marvell,odmi-controller";
34+
compatible = "marvell,ap806-odm-controller",
35+
"marvell,odmi-controller";
3336
interrupt-controller;
3437
msi-controller;
3538
marvell,odmi-frames = <4>;

0 commit comments

Comments
 (0)