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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
  Input: ADP5589 - new driver for I2C Keypad Decoder and I/O Expander
  Input: tsc2007 - add X, Y and Z fuzz factors to platform data
  Input: tsc2007 - add poll_period parameter to platform data
  Input: tsc2007 - add poll_delay parameter to platform data
  Input: tsc2007 - add max_rt parameter to platform data
  Input: tsc2007 - debounce pressure measurement
  Input: ad714x - fix captouch wheel option algorithm
  Input: ad714x - allow platform code to specify irqflags
  Input: ad714x - fix threshold and completion interrupt masks
  Input: ad714x - fix up input configuration
  Input: elantech - remove support for proprietary X driver
  Input: elantech - report multitouch with proper ABS_MT messages
  Input: elantech - export pressure and width when supported
  Input: elantech - describe further the protocol
  Input: atmel_tsadcc - correct call to input_free_device
  Input: add driver FSL MPR121 capacitive touch sensor
  Input: remove useless synchronize_rcu() calls
  Input: ads7846 - fix gpio_pendown configuration
  Input: ads7846 - add possibility to use external vref on ads7846
  Input: rotary-encoder - add support for half-period encoders
  ...

2 files changed, 61 insertions, 17 deletions

diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 04d9bf320a4f..32503565faf9 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -16,6 +16,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/input.h>
+#include <linux/input/mt.h>
 #include <linux/serio.h>
 #include <linux/libps2.h>
 #include "psmouse.h"
@@ -242,15 +243,37 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse)
         input_sync(dev);
 }
 
+static void elantech_set_slot(struct input_dev *dev, int slot, bool active,
+                              unsigned int x, unsigned int y)
+{
+        input_mt_slot(dev, slot);
+        input_mt_report_slot_state(dev, MT_TOOL_FINGER, active);
+        if (active) {
+                input_report_abs(dev, ABS_MT_POSITION_X, x);
+                input_report_abs(dev, ABS_MT_POSITION_Y, y);
+        }
+}
+
+/* x1 < x2 and y1 < y2 when two fingers, x = y = 0 when not pressed */
+static void elantech_report_semi_mt_data(struct input_dev *dev,
+                                         unsigned int num_fingers,
+                                         unsigned int x1, unsigned int y1,
+                                         unsigned int x2, unsigned int y2)
+{
+        elantech_set_slot(dev, 0, num_fingers != 0, x1, y1);
+        elantech_set_slot(dev, 1, num_fingers == 2, x2, y2);
+}
+
 /*
  * Interpret complete data packets and report absolute mode input events for
  * hardware version 2. (6 byte packets)
  */
 static void elantech_report_absolute_v2(struct psmouse *psmouse)
 {
+        struct elantech_data *etd = psmouse->private;
         struct input_dev *dev = psmouse->dev;
         unsigned char *packet = psmouse->packet;
-        int fingers, x1, y1, x2, y2;
+        unsigned int fingers, x1 = 0, y1 = 0, x2 = 0, y2 = 0, width = 0, pres = 0;
 
         /* byte 0: n1  n0   .   .   .   .   R   L */
         fingers = (packet[0] & 0xc0) >> 6;
@@ -270,14 +293,18 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse)
                  * byte 1:  .   .   .   .   .  x10 x9  x8
                  * byte 2: x7  x6  x5  x4  x4  x2  x1  x0
                  */
-                input_report_abs(dev, ABS_X,
-                        ((packet[1] & 0x07) << 8) | packet[2]);
+                x1 = ((packet[1] & 0x07) << 8) | packet[2];
                 /*
                  * byte 4:  .   .   .   .   .   .  y9  y8
                  * byte 5: y7  y6  y5  y4  y3  y2  y1  y0
                  */
-                input_report_abs(dev, ABS_Y,
-                        ETP_YMAX_V2 - (((packet[4] & 0x03) << 8) | packet[5]));
+                y1 = ETP_YMAX_V2 - (((packet[4] & 0x03) << 8) | packet[5]);
+
+                input_report_abs(dev, ABS_X, x1);
+                input_report_abs(dev, ABS_Y, y1);
+
+                pres = (packet[1] & 0xf0) | ((packet[4] & 0xf0) >> 4);
+                width = ((packet[0] & 0x30) >> 2) | ((packet[3] & 0x30) >> 4);
                 break;
 
         case 2:
@@ -303,23 +330,24 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse)
                  */
                 input_report_abs(dev, ABS_X, x1 << 2);
                 input_report_abs(dev, ABS_Y, y1 << 2);
-                /*
-                 * For compatibility with the proprietary X Elantech driver
-                 * report both coordinates as hat coordinates
-                 */
-                input_report_abs(dev, ABS_HAT0X, x1);
-                input_report_abs(dev, ABS_HAT0Y, y1);
-                input_report_abs(dev, ABS_HAT1X, x2);
-                input_report_abs(dev, ABS_HAT1Y, y2);
+
+                /* Unknown so just report sensible values */
+                pres = 127;
+                width = 7;
                 break;
         }
 
+        elantech_report_semi_mt_data(dev, fingers, x1, y1, x2, y2);
         input_report_key(dev, BTN_TOOL_FINGER, fingers == 1);
         input_report_key(dev, BTN_TOOL_DOUBLETAP, fingers == 2);
         input_report_key(dev, BTN_TOOL_TRIPLETAP, fingers == 3);
         input_report_key(dev, BTN_TOOL_QUADTAP, fingers == 4);
         input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
         input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
+        if (etd->reports_pressure) {
+                input_report_abs(dev, ABS_PRESSURE, pres);
+                input_report_abs(dev, ABS_TOOL_WIDTH, width);
+        }
 
         input_sync(dev);
 }
@@ -478,10 +506,16 @@ static void elantech_set_input_params(struct psmouse *psmouse)
                 __set_bit(BTN_TOOL_QUADTAP, dev->keybit);
                 input_set_abs_params(dev, ABS_X, ETP_XMIN_V2, ETP_XMAX_V2, 0, 0);
                 input_set_abs_params(dev, ABS_Y, ETP_YMIN_V2, ETP_YMAX_V2, 0, 0);
-                input_set_abs_params(dev, ABS_HAT0X, ETP_2FT_XMIN, ETP_2FT_XMAX, 0, 0);
-                input_set_abs_params(dev, ABS_HAT0Y, ETP_2FT_YMIN, ETP_2FT_YMAX, 0, 0);
-                input_set_abs_params(dev, ABS_HAT1X, ETP_2FT_XMIN, ETP_2FT_XMAX, 0, 0);
-                input_set_abs_params(dev, ABS_HAT1Y, ETP_2FT_YMIN, ETP_2FT_YMAX, 0, 0);
+                if (etd->reports_pressure) {
+                        input_set_abs_params(dev, ABS_PRESSURE, ETP_PMIN_V2,
+                                             ETP_PMAX_V2, 0, 0);
+                        input_set_abs_params(dev, ABS_TOOL_WIDTH, ETP_WMIN_V2,
+                                             ETP_WMAX_V2, 0, 0);
+                }
+                __set_bit(INPUT_PROP_SEMI_MT, dev->propbit);
+                input_mt_init_slots(dev, 2);
+                input_set_abs_params(dev, ABS_MT_POSITION_X, ETP_XMIN_V2, ETP_XMAX_V2, 0, 0);
+                input_set_abs_params(dev, ABS_MT_POSITION_Y, ETP_YMIN_V2, ETP_YMAX_V2, 0, 0);
                 break;
         }
 }
@@ -725,6 +759,10 @@ int elantech_init(struct psmouse *psmouse)
                 etd->debug = 1;
                 /* Don't know how to do parity checking for version 2 */
                 etd->paritycheck = 0;
+
+                if (etd->fw_version >= 0x020800)
+                        etd->reports_pressure = true;
+
         } else {
                 etd->hw_version = 1;
                 etd->paritycheck = 1;
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
index aa4aac5d2198..fabb2b99615c 100644
--- a/drivers/input/mouse/elantech.h
+++ b/drivers/input/mouse/elantech.h
@@ -77,6 +77,11 @@
 #define ETP_YMIN_V2                     (   0 + ETP_EDGE_FUZZ_V2)
 #define ETP_YMAX_V2                     ( 768 - ETP_EDGE_FUZZ_V2)
 
+#define ETP_PMIN_V2                     0
+#define ETP_PMAX_V2                     255
+#define ETP_WMIN_V2                     0
+#define ETP_WMAX_V2                     15
+
 /*
  * For two finger touches the coordinate of each finger gets reported
  * separately but with reduced resolution.
@@ -102,6 +107,7 @@ struct elantech_data {
         unsigned char capabilities;
         bool paritycheck;
         bool jumpy_cursor;
+        bool reports_pressure;
         unsigned char hw_version;
         unsigned int fw_version;
         unsigned int single_finger_reports;