Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull second round of input updates from Dmitry Torokhov:
 "An update to Elantech driver to support hardware v7, fix to the new
  cyttsp4 driver to use proper addressing, ads7846 device tree support
  and nspire-keypad got a small cleanup."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: nspire-keypad - replace magic offset with define
  Input: elantech - fix for newer hardware versions (v7)
  Input: cyttsp4 - use 16bit address for I2C/SPI communication
  Input: ads7846 - add device tree bindings
  Input: ads7846 - make sure we do not change platform data

9 files changed, 253 insertions, 56 deletions

diff --git a/Documentation/devicetree/bindings/input/ads7846.txt b/Documentation/devicetree/bindings/input/ads7846.txt
new file mode 100644
index 000000000000..5f7619c22743
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/ads7846.txt
@@ -0,0 +1,91 @@
+Device tree bindings for TI's ADS7843, ADS7845, ADS7846, ADS7873, TSC2046
+SPI driven touch screen controllers.
+
+The node for this driver must be a child node of a SPI controller, hence
+all mandatory properties described in
+
+        Documentation/devicetree/bindings/spi/spi-bus.txt
+
+must be specified.
+
+Additional required properties:
+
+        compatible              Must be one of the following, depending on the
+                                model:
+                                        "ti,tsc2046"
+                                        "ti,ads7843"
+                                        "ti,ads7845"
+                                        "ti,ads7846"
+                                        "ti,ads7873"
+
+        interrupt-parent
+        interrupts              An interrupt node describing the IRQ line the chip's
+                                !PENIRQ pin is connected to.
+        vcc-supply              A regulator node for the supply voltage.
+
+
+Optional properties:
+
+        ti,vref-delay-usecs             vref supply delay in usecs, 0 for
+                                        external vref (u16).
+        ti,vref-mv                      The VREF voltage, in millivolts (u16).
+        ti,keep-vref-on                 set to keep vref on for differential
+                                        measurements as well
+        ti,swap-xy                      swap x and y axis
+        ti,settle-delay-usec            Settling time of the analog signals;
+                                        a function of Vcc and the capacitance
+                                        on the X/Y drivers.  If set to non-zero,
+                                        two samples are taken with settle_delay
+                                        us apart, and the second one is used.
+                                        ~150 uSec with 0.01uF caps (u16).
+        ti,penirq-recheck-delay-usecs   If set to non-zero, after samples are
+                                        taken this delay is applied and penirq
+                                        is rechecked, to help avoid false
+                                        events.  This value is affected by the
+                                        material used to build the touch layer
+                                        (u16).
+        ti,x-plate-ohms                 Resistance of the X-plate,
+                                        in Ohms (u16).
+        ti,y-plate-ohms                 Resistance of the Y-plate,
+                                        in Ohms (u16).
+        ti,x-min                        Minimum value on the X axis (u16).
+        ti,y-min                        Minimum value on the Y axis (u16).
+        ti,x-max                        Maximum value on the X axis (u16).
+        ti,y-max                        Minimum value on the Y axis (u16).
+        ti,pressure-min                 Minimum reported pressure value
+                                        (threshold) - u16.
+        ti,pressure-max                 Maximum reported pressure value (u16).
+        ti,debounce-max                 Max number of additional readings per
+                                        sample (u16).
+        ti,debounce-tol                 Tolerance used for filtering (u16).
+        ti,debounce-rep                 Additional consecutive good readings
+                                        required after the first two (u16).
+        ti,pendown-gpio-debounce        Platform specific debounce time for the
+                                        pendown-gpio (u32).
+        pendown-gpio                    GPIO handle describing the pin the !PENIRQ
+                                        line is connected to.
+        linux,wakeup                    use any event on touchscreen as wakeup event.
+
+
+Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::
+
+        spi_controller {
+                tsc2046@0 {
+                        reg = <0>;      /* CS0 */
+                        compatible = "ti,tsc2046";
+                        interrupt-parent = <&gpio1>;
+                        interrupts = <8 0>;     /* BOOT6 / GPIO 8 */
+                        spi-max-frequency = <1000000>;
+                        pendown-gpio = <&gpio1 8 0>;
+                        vcc-supply = <&reg_vcc3>;
+
+                        ti,x-min = /bits/ 16 <0>;
+                        ti,x-max = /bits/ 16 <8000>;
+                        ti,y-min = /bits/ 16 <0>;
+                        ti,y-max = /bits/ 16 <4800>;
+                        ti,x-plate-ohms = /bits/ 16 <40>;
+                        ti,pressure-max = /bits/ 16 <255>;
+
+                        linux,wakeup;
+                };
+        };
diff --git a/drivers/input/keyboard/nspire-keypad.c b/drivers/input/keyboard/nspire-keypad.c
index e0a1339e40e6..20d872d6f603 100644
--- a/drivers/input/keyboard/nspire-keypad.c
+++ b/drivers/input/keyboard/nspire-keypad.c
@@ -122,7 +122,7 @@ static int nspire_keypad_chip_init(struct nspire_keypad *keypad)
 
         /* Enable interrupts */
         keypad->int_mask = 1 << 1;
-        writel(keypad->int_mask, keypad->reg_base + 0xc);
+        writel(keypad->int_mask, keypad->reg_base + KEYPAD_INTMSK);
 
         /* Disable GPIO interrupts to prevent hanging on touchpad */
         /* Possibly used to detect touchpad events */
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 1e8e42fb03a4..57b2637e153a 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -694,18 +694,18 @@ static int elantech_packet_check_v3(struct psmouse *psmouse)
 static int elantech_packet_check_v4(struct psmouse *psmouse)
 {
         unsigned char *packet = psmouse->packet;
+        unsigned char packet_type = packet[3] & 0x03;
 
-        if ((packet[0] & 0x0c) == 0x04 &&
-            (packet[3] & 0x1f) == 0x11)
+        switch (packet_type) {
+        case 0:
+                return PACKET_V4_STATUS;
+
+        case 1:
                 return PACKET_V4_HEAD;
 
-        if ((packet[0] & 0x0c) == 0x04 &&
-            (packet[3] & 0x1f) == 0x12)
+        case 2:
                 return PACKET_V4_MOTION;
-
-        if ((packet[0] & 0x0c) == 0x04 &&
-            (packet[3] & 0x1f) == 0x10)
-                return PACKET_V4_STATUS;
+        }
 
         return PACKET_UNKNOWN;
 }
@@ -1282,6 +1282,7 @@ static int elantech_set_properties(struct elantech_data *etd)
                         etd->hw_version = 3;
                         break;
                 case 6:
+                case 7:
                         etd->hw_version = 4;
                         break;
                 default:
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 84ccf140c1bb..ea195360747e 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -27,6 +27,9 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/pm.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/of_device.h>
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
@@ -961,9 +964,9 @@ static int ads7846_resume(struct device *dev)