Merge tag 'mips_5.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / input / lpc32xx-key.txt

diff --git a/Documentation/devicetree/bindings/input/lpc32xx-key.txt b/Documentation/devicetree/bindings/input/lpc32xx-key.txt
index bcf62f856358d095916ffe50de4f9d6e65abae50..2b075a080d303bab7fc2353093ef09f9770edc0f 100644 (file)
--- a/Documentation/devicetree/bindings/input/lpc32xx-key.txt
+++ b/Documentation/devicetree/bindings/input/lpc32xx-key.txt
@@ -8,6 +8,7 @@ Required Properties:
 - reg: Physical base address of the controller and length of memory mapped
   region.
 - interrupts: The interrupt number to the cpu.
+- clocks: phandle to clock controller plus clock-specifier pair
 - nxp,debounce-delay-ms: Debounce delay in ms
 - nxp,scan-delay-ms: Repeated scan period in ms
 - linux,keymap: the key-code to be reported when the key is pressed
@@ -22,7 +23,9 @@ Example:
        key@40050000 {
                compatible = "nxp,lpc3220-key";
                reg = <0x40050000 0x1000>;
-               interrupts = <54 0>;
+               clocks = <&clk LPC32XX_CLK_KEY>;
+               interrupt-parent = <&sic1>;
+               interrupts = <22 IRQ_TYPE_LEVEL_HIGH>;
                keypad,num-rows = <1>;
                keypad,num-columns = <1>;
                nxp,debounce-delay-ms = <3>;