Commit 725b06f3 authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge branch 'irqchip/mvebu' into irqchip/core

parents 1ad9a576 b009b096
Loading
Loading
Loading
Loading
+5 −2
Original line number Original line Diff line number Diff line
@@ -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>;