Merge tag 'irqchip-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / input / touchscreen / mms114.txt

diff --git a/Documentation/devicetree/bindings/input/touchscreen/mms114.txt b/Documentation/devicetree/bindings/input/touchscreen/mms114.txt
index 89d4c56c567119014ec8c5170fd14ca688e56075..2cd954051d299f1f4adc3e130184d9e04eac4a41 100644 (file)
--- a/Documentation/devicetree/bindings/input/touchscreen/mms114.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/mms114.txt
@@ -1,17 +1,23 @@
-* MELFAS MMS114 touchscreen controller
+* MELFAS MMS114/MMS152 touchscreen controller
 
 Required properties:
-- compatible: must be "melfas,mms114"
+- compatible: should be one of:
+       - "melfas,mms114"
+       - "melfas,mms152"
 - reg: I2C address of the chip
 - interrupts: interrupt to which the chip is connected
-- x-size: horizontal resolution of touchscreen
-- y-size: vertical resolution of touchscreen
+- touchscreen-size-x: See [1]
+- touchscreen-size-y: See [1]
 
 Optional properties:
-- contact-threshold:
-- moving-threshold:
-- x-invert: invert X axis
-- y-invert: invert Y axis
+- touchscreen-fuzz-x: See [1]
+- touchscreen-fuzz-y: See [1]
+- touchscreen-fuzz-pressure: See [1]
+- touchscreen-inverted-x: See [1]
+- touchscreen-inverted-y: See [1]
+- touchscreen-swapped-x-y: See [1]
+
+[1]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
 
 Example:
 
@@ -22,12 +28,13 @@ Example:
                        compatible = "melfas,mms114";
                        reg = <0x48>;
                        interrupts = <39 0>;
-                       x-size = <720>;
-                       y-size = <1280>;
-                       contact-threshold = <10>;
-                       moving-threshold = <10>;
-                       x-invert;
-                       y-invert;
+                       touchscreen-size-x = <720>;
+                       touchscreen-size-y = <1280>;
+                       touchscreen-fuzz-x = <10>;
+                       touchscreen-fuzz-y = <10>;
+                       touchscreen-fuzz-pressure = <10>;
+                       touchscreen-inverted-x;
+                       touchscreen-inverted-y;
                };
 
                /* ... */