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

Pull input layer updates from Dmitry Torokhov:
 - a bunch of new drivers (DA9052/53 touchscreenn controller, Synaptics
   Navpoint, LM8333 keypads, Wacom I2C touhscreen);
 - updates to existing touchpad drivers (ALPS, Sntelic);
 - Wacom driver now supports Intuos5;
 - device-tree bindings in numerous drivers;
 - other cleanups and fixes.

Fix annoying conflict in drivers/input/tablet/wacom_wac.c that I think
implies that the input layer device naming is broken, but let's see.  I
brough it up with Dmitry.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
  Input: matrix-keymap - fix building keymaps
  Input: spear-keyboard - document DT bindings
  Input: spear-keyboard - add device tree bindings
  Input: matrix-keymap - wire up device tree support
  Input: matrix-keymap - uninline and prepare for device tree support
  Input: adp5588 - add support for gpio names
  Input: omap-keypad - dynamically handle register offsets
  Input: synaptics - fix compile warning
  MAINTAINERS: adjust input-related patterns
  Input: ALPS - switch to using input_mt_report_finger_count
  Input: ALPS - add semi-MT support for v4 protocol
  Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver
  Input: atmel_mxt_ts - dump each message on just 1 line
  Input: atmel_mxt_ts - do not read extra (checksum) byte
  Input: atmel_mxt_ts - verify object size in mxt_write_object
  Input: atmel_mxt_ts - only allow root to update firmware
  Input: atmel_mxt_ts - use CONFIG_PM_SLEEP
  Input: sentelic - report device's production serial number
  Input: tl6040-vibra - Device Tree support
  Input: evdev - properly handle read/write with count 0
  ...

1 files changed, 71 insertions, 10 deletions

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 4c6a72d3d48c..4a1347e91bdc 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -553,10 +553,7 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)
 
         alps_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_mt_report_finger_count(dev, fingers);
 
         input_report_key(dev, BTN_LEFT, left);
         input_report_key(dev, BTN_RIGHT, right);
@@ -604,10 +601,54 @@ static void alps_process_packet_v3(struct psmouse *psmouse)
 
 static void alps_process_packet_v4(struct psmouse *psmouse)
 {
+        struct alps_data *priv = psmouse->private;
         unsigned char *packet = psmouse->packet;
         struct input_dev *dev = psmouse->dev;
+        int offset;
         int x, y, z;
         int left, right;
+        int x1, y1, x2, y2;
+        int fingers = 0;
+        unsigned int x_bitmap, y_bitmap;
+
+        /*
+         * v4 has a 6-byte encoding for bitmap data, but this data is
+         * broken up between 3 normal packets. Use priv->multi_packet to
+         * track our position in the bitmap packet.
+         */
+        if (packet[6] & 0x40) {
+                /* sync, reset position */
+                priv->multi_packet = 0;
+        }
+
+        if (WARN_ON_ONCE(priv->multi_packet > 2))
+                return;
+
+        offset = 2 * priv->multi_packet;
+        priv->multi_data[offset] = packet[6];
+        priv->multi_data[offset + 1] = packet[7];
+
+        if (++priv->multi_packet > 2) {
+                priv->multi_packet = 0;
+
+                x_bitmap = ((priv->multi_data[2] & 0x1f) << 10) |
+                           ((priv->multi_data[3] & 0x60) << 3) |
+                           ((priv->multi_data[0] & 0x3f) << 2) |
+                           ((priv->multi_data[1] & 0x60) >> 5);
+                y_bitmap = ((priv->multi_data[5] & 0x01) << 10) |
+                           ((priv->multi_data[3] & 0x1f) << 5) |
+                            (priv->multi_data[1] & 0x1f);
+
+                fingers = alps_process_bitmap(x_bitmap, y_bitmap,
+                                              &x1, &y1, &x2, &y2);
+
+                /* Store MT data.*/
+                priv->fingers = fingers;
+                priv->x1 = x1;
+                priv->x2 = x2;
+                priv->y1 = y1;
+                priv->y2 = y2;
+        }
 
         left = packet[4] & 0x01;
         right = packet[4] & 0x02;
@@ -617,21 +658,41 @@ static void alps_process_packet_v4(struct psmouse *psmouse)
         y = ((packet[2] & 0x7f) << 4) | (packet[3] & 0x0f);
         z = packet[5] & 0x7f;
 
+        /*
+         * If there were no contacts in the bitmap, use ST
+         * points in MT reports.
+         * If there were two contacts or more, report MT data.
+         */
+        if (priv->fingers < 2) {
+                x1 = x;
+                y1 = y;
+                fingers = z > 0 ? 1 : 0;
+        } else {
+                fingers = priv->fingers;
+                x1 = priv->x1;
+                x2 = priv->x2;
+                y1 = priv->y1;
+                y2 = priv->y2;
+        }
+
         if (z >= 64)
                 input_report_key(dev, BTN_TOUCH, 1);
         else
                 input_report_key(dev, BTN_TOUCH, 0);
 
+        alps_report_semi_mt_data(dev, fingers, x1, y1, x2, y2);
+
+        input_mt_report_finger_count(dev, fingers);
+
+        input_report_key(dev, BTN_LEFT, left);
+        input_report_key(dev, BTN_RIGHT, right);
+
         if (z > 0) {
                 input_report_abs(dev, ABS_X, x);
                 input_report_abs(dev, ABS_Y, y);
         }
         input_report_abs(dev, ABS_PRESSURE, z);
 
-        input_report_key(dev, BTN_TOOL_FINGER, z > 0);
-        input_report_key(dev, BTN_LEFT, left);
-        input_report_key(dev, BTN_RIGHT, right);
-
         input_sync(dev);
 }
 
@@ -1557,6 +1618,7 @@ int alps_init(struct psmouse *psmouse)
                 input_set_abs_params(dev1, ABS_Y, 0, 767, 0, 0);
                 break;
         case ALPS_PROTO_V3:
+        case ALPS_PROTO_V4:
                 set_bit(INPUT_PROP_SEMI_MT, dev1->propbit);
                 input_mt_init_slots(dev1, 2);
                 input_set_abs_params(dev1, ABS_MT_POSITION_X, 0, ALPS_V3_X_MAX, 0, 0);
@@ -1565,8 +1627,7 @@ int alps_init(struct psmouse *psmouse)
                 set_bit(BTN_TOOL_DOUBLETAP, dev1->keybit);
                 set_bit(BTN_TOOL_TRIPLETAP, dev1->keybit);
                 set_bit(BTN_TOOL_QUADTAP, dev1->keybit);
-                /* fall through */
-        case ALPS_PROTO_V4:
+
                 input_set_abs_params(dev1, ABS_X, 0, ALPS_V3_X_MAX, 0, 0);
                 input_set_abs_params(dev1, ABS_Y, 0, ALPS_V3_Y_MAX, 0, 0);
                 break;