Merge branch 'next' into for-linus

Prepare input updates for 3.19.

77 files changed, 4949 insertions, 922 deletions

diff --git a/Documentation/devicetree/bindings/input/cap1106.txt b/Documentation/devicetree/bindings/input/cap11xx.txt
index 4b463904cba0..7d0a3009771b 100644
--- a/Documentation/devicetree/bindings/input/cap1106.txt
+++ b/Documentation/devicetree/bindings/input/cap11xx.txt
@@ -1,14 +1,16 @@
-Device tree bindings for Microchip CAP1106, 6 channel capacitive touch sensor
+Device tree bindings for Microchip CAP11xx based capacitive touch sensors
 
-The node for this driver must be a child of a I2C controller node, as the
+The node for this device must be a child of a I2C controller node, as the
 device communication via I2C only.
 
 Required properties:
 
-        compatible:             Must be "microchip,cap1106"
+        compatible:             Must contain one of:
+                                        "microchip,cap1106"
+                                        "microchip,cap1126"
+                                        "microchip,cap1188"
 
         reg:                    The I2C slave address of the device.
-                                Only 0x28 is valid.
 
         interrupts:             Property describing the interrupt line the
                                 device's ALERT#/CM_IRQ# pin is connected to.
@@ -26,6 +28,10 @@ Optional properties:
                                 Valid values are 1, 2, 4, and 8.
                                 By default, a gain of 1 is set.
 
+        microchip,irq-active-high:      By default the interrupt pin is active low
+                                open drain. This property allows using the active
+                                high push-pull output.
+
         linux,keycodes:         Specifies an array of numeric keycode values to
                                 be used for the channels. If this property is
                                 omitted, KEY_A, KEY_B, etc are used as
@@ -43,11 +49,11 @@ i2c_controller {
                 autorepeat;
                 microchip,sensor-gain = <2>;
 
-                linux,keycodes = <103           /* KEY_UP */
-                                  106           /* KEY_RIGHT */
-                                  108           /* KEY_DOWN */
-                                  105           /* KEY_LEFT */
-                                  109           /* KEY_PAGEDOWN */
-                                  104>;         /* KEY_PAGEUP */
+                linux,keycodes = <103>,         /* KEY_UP */
+                                 <106>,         /* KEY_RIGHT */
+                                 <108>,         /* KEY_DOWN */
+                                 <105>,         /* KEY_LEFT */
+                                 <109>,         /* KEY_PAGEDOWN */
+                                 <104>;         /* KEY_PAGEUP */
         };
 }
diff --git a/Documentation/devicetree/bindings/input/elan_i2c.txt b/Documentation/devicetree/bindings/input/elan_i2c.txt
new file mode 100644
index 000000000000..ee3242c4ba67
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/elan_i2c.txt
@@ -0,0 +1,34 @@
+Elantech I2C Touchpad
+
+Required properties:
+- compatible: must be "elan,ekth3000".
+- reg: I2C address of the chip.
+- interrupt-parent: a phandle for the interrupt controller (see interrupt
+  binding[0]).
+- interrupts: interrupt to which the chip is connected (see interrupt
+  binding[0]).
+
+Optional properties:
+- wakeup-source: touchpad can be used as a wakeup source.
+- pinctrl-names: should be "default" (see pinctrl binding [1]).