Merge branch 'cpuidle' into release

[karo-tx-linux.git] / Documentation / devicetree / bindings / input / touchscreen / zforce_ts.txt

diff --git a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
index 80c37df940a7ecc78d1543be0ff5f6f9092f9477..e3c27c4fd9c851fbbb51791084b280a9e343827d 100644 (file)
--- a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
@@ -4,12 +4,12 @@ Required properties:
 - compatible: must be "neonode,zforce"
 - reg: I2C address of the chip
 - interrupts: interrupt to which the chip is connected
-- gpios: gpios the chip is connected to
-  first one is the interrupt gpio and second one the reset gpio
+- reset-gpios: reset gpio the chip is connected to
 - x-size: horizontal resolution of touchscreen
 - y-size: vertical resolution of touchscreen
 
 Optional properties:
+- irq-gpios : interrupt gpio the chip is connected to
 - vdd-supply: Regulator controlling the controller supply
 
 Example:
@@ -23,8 +23,8 @@ Example:
                        interrupts = <2 0>;
                        vdd-supply = <&reg_zforce_vdd>;
 
-                       gpios = <&gpio5 6 0>, /* INT */
-                               <&gpio5 9 0>; /* RST */
+                       reset-gpios = <&gpio5 9 0>; /* RST */
+                       irq-gpios = <&gpio5 6 0>; /* IRQ, optional */
 
                        x-size = <800>;
                        y-size = <600>;