Merge tag 'irqchip-core-4.6-3' of git://git.infradead.org/users/jcooper/linux into...

Pull irqchip core changes from Jason Cooper:

- mvebu: Update dt binding docs for new odmi driver

diff --git a/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt b/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt
index 252d5c9c31f96b67f0c01352e1438ca2149091e5..8af0a8e613abeb653e69c54769f83917c06568f7 100644 (file)
--- 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>;