Input: imx6ul_tsc - generalize the averaging property

Make the avarage-samples property a general touchscreen property
rather than imx6ul device specific.

Signed-off-by: Guy Shapiro <guy.shapiro@mobi-wize.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

2 files changed, 6 insertions, 8 deletions

diff --git a/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt b/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt
index a66069f6db66..d4927c202aef 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt
@@ -17,13 +17,8 @@ Optional properties:
   This value depends on the touch screen.
 - pre-charge-time: the touch screen need some time to precharge.
   This value depends on the touch screen.
-- average-samples: Number of data samples which are averaged for each read.
-        Valid values 0-4
-        0 =  1 sample
-        1 =  4 samples
-        2 =  8 samples
-        3 = 16 samples
-        4 = 32 samples
+- touchscreen-average-samples: Number of data samples which are averaged for
+  each read. Valid values are 1, 4, 8, 16 and 32.
 
 Example:
         tsc: tsc@02040000 {
@@ -39,6 +34,6 @@ Example:
                 xnur-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>;
                 measure-delay-time = <0xfff>;
                 pre-charge-time = <0xffff>;
-                average-samples = <4>;
+                touchscreen-average-samples = <32>;
                 status = "okay";
         };
diff --git a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt b/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
index bccaa4e73045..537643e86f61 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
@@ -14,6 +14,9 @@ Optional properties for Touchscreens:
  - touchscreen-fuzz-pressure    : pressure noise value of the absolute input
                                   device (arbitrary range dependent on the
                                   controller)
+ - touchscreen-average-samples : Number of data samples which are averaged
+                                  for each read (valid values dependent on the
+                                  controller)
  - touchscreen-inverted-x       : X axis is inverted (boolean)
  - touchscreen-inverted-y       : Y axis is inverted (boolean)
  - touchscreen-swapped-x-y      : X and Y axis are swapped (boolean)