Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

+5 −2
Original line number Diff line number Diff line
@@ -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>;