Merge tag 'v3.11' into next

Merge with mainline to bring in sync changes to cyttsp4 driver.

2 files changed, 49 insertions, 19 deletions

diff --git a/Documentation/devicetree/bindings/input/samsung-keypad.txt b/Documentation/devicetree/bindings/input/samsung-keypad.txt
index ce3e394c0e64..942d071baaa5 100644
--- a/Documentation/devicetree/bindings/input/samsung-keypad.txt
+++ b/Documentation/devicetree/bindings/input/samsung-keypad.txt
@@ -25,14 +25,6 @@ Required Board Specific Properties:
 - samsung,keypad-num-columns: Number of column lines connected to the
   keypad controller.
 
-- row-gpios: List of gpios used as row lines. The gpio specifier for
-  this property depends on the gpio controller to which these row lines
-  are connected.
-
-- col-gpios: List of gpios used as column lines. The gpio specifier for
-  this property depends on the gpio controller to which these column
-  lines are connected.
-
 - Keys represented as child nodes: Each key connected to the keypad
   controller is represented as a child node to the keypad controller
   device node and should include the following properties.
@@ -41,6 +33,9 @@ Required Board Specific Properties:
   - linux,code: the key-code to be reported when the key is pressed
     and released.
 
+- pinctrl-0: Should specify pin control groups used for this controller.
+- pinctrl-names: Should contain only one value - "default".
+
 Optional Properties specific to linux:
 - linux,keypad-no-autorepeat: do no enable autorepeat feature.
 - linux,keypad-wakeup: use any event on keypad as wakeup event.
@@ -56,17 +51,8 @@ Example:
                 linux,input-no-autorepeat;
                 linux,input-wakeup;
 
-                row-gpios = <&gpx2 0 3 3 0
-                             &gpx2 1 3 3 0>;
-
-                col-gpios = <&gpx1 0 3 0 0
-                             &gpx1 1 3 0 0
-                             &gpx1 2 3 0 0
-                             &gpx1 3 3 0 0
-                             &gpx1 4 3 0 0
-                             &gpx1 5 3 0 0
-                             &gpx1 6 3 0 0
-                             &gpx1 7 3 0 0>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&keypad_rows &keypad_columns>;
 
                 key_1 {
                         keypad,row = <0>;
diff --git a/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt b/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt
new file mode 100644
index 000000000000..491c97b78384
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt
@@ -0,0 +1,44 @@
+* TI - TSC ADC (Touschscreen and analog digital converter)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Required properties:
+- child "tsc"
+        ti,wires: Wires refer to application modes i.e. 4/5/8 wire touchscreen
+                  support on the platform.
+        ti,x-plate-resistance: X plate resistance
+        ti,coordiante-readouts: The sequencer supports a total of 16
+                                programmable steps each step is used to
+                                read a single coordinate. A single
+                                readout is enough but multiple reads can
+                                increase the quality.
+                                A value of 5 means, 5 reads for X, 5 for
+                                Y and 2 for Z (always). This utilises 12
+                                of the 16 software steps available. The
+                                remaining 4 can be used by the ADC.
+        ti,wire-config: Different boards could have a different order for
+                        connecting wires on touchscreen. We need to provide an
+                        8 bit number where in the 1st four bits represent the
+                        analog lines and the next 4 bits represent positive/
+                        negative terminal on that input line. Notations to
+                        represent the input lines and terminals resoectively
+                        is as follows:
+                        AIN0 = 0, AIN1 = 1 and so on till AIN7 = 7.
+                        XP  = 0, XN = 1, YP = 2, YN = 3.
+- child "adc"
+        ti,adc-channels: List of analog inputs available for ADC.
+                         AIN0 = 0, AIN1 = 1 and so on till AIN7 = 7.
+
+Example:
+        tscadc: tscadc@44e0d000 {
+                compatible = "ti,am3359-tscadc";
+                tsc {
+                        ti,wires = <4>;
+                        ti,x-plate-resistance = <200>;
+                        ti,coordiante-readouts = <5>;
+                        ti,wire-config = <0x00 0x11 0x22 0x33>;
+                };
+
+                adc {
+                        ti,adc-channels = <4 5 6 7>;
+                };
+        }