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

Pull input fixes from Dmitry Torokhov:

 - a tweak to the IBM Trackpoint driver that helps recognizing
   trackpoints on never Lenovo Carbons

 - a fix to the ALPS driver solving scroll issues on some Dells

 - yet another ACPI ID has been added to Elan I2C toucpad driver

 - quieted diagnostic message in soc_button_array driver

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ALPS - fix two-finger scroll breakage in right side on ALPS touchpad
  Input: soc_button_array - silence -ENOENT error on Dell XPS13 9365
  Input: trackpoint - add new trackpoint firmware ID
  Input: elan_i2c - add ELAN0602 ACPI ID to support Lenovo Yoga310

6 files changed, 45 insertions, 13 deletions

diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index f600f3a7a3c6..23520df7650f 100644
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c
@@ -331,7 +331,7 @@ static int soc_button_probe(struct platform_device *pdev)
         error = gpiod_count(dev, NULL);
         if (error < 0) {
                 dev_dbg(dev, "no GPIO attached, ignoring...\n");
-                return error;
+                return -ENODEV;
         }
 
         priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 262d1057c1da..850b00e3ad8e 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1215,14 +1215,24 @@ static int alps_decode_ss4_v2(struct alps_fields *f,
 
         case SS4_PACKET_ID_TWO:
                 if (priv->flags & ALPS_BUTTONPAD) {
-                        f->mt[0].x = SS4_BTL_MF_X_V2(p, 0);
+                        if (IS_SS4PLUS_DEV(priv->dev_id)) {
+                                f->mt[0].x = SS4_PLUS_BTL_MF_X_V2(p, 0);
+                                f->mt[1].x = SS4_PLUS_BTL_MF_X_V2(p, 1);
+                        } else {
+                                f->mt[0].x = SS4_BTL_MF_X_V2(p, 0);
+                                f->mt[1].x = SS4_BTL_MF_X_V2(p, 1);
+                        }
                         f->mt[0].y = SS4_BTL_MF_Y_V2(p, 0);
-                        f->mt[1].x = SS4_BTL_MF_X_V2(p, 1);
                         f->mt[1].y = SS4_BTL_MF_Y_V2(p, 1);
                 } else {
-                        f->mt[0].x = SS4_STD_MF_X_V2(p, 0);
+                        if (IS_SS4PLUS_DEV(priv->dev_id)) {
+                                f->mt[0].x = SS4_PLUS_STD_MF_X_V2(p, 0);
+                                f->mt[1].x = SS4_PLUS_STD_MF_X_V2(p, 1);
+                        } else {
+                                f->mt[0].x = SS4_STD_MF_X_V2(p, 0);
+                                f->mt[1].x = SS4_STD_MF_X_V2(p, 1);
+                        }
                         f->mt[0].y = SS4_STD_MF_Y_V2(p, 0);
-                        f->mt[1].x = SS4_STD_MF_X_V2(p, 1);
                         f->mt[1].y = SS4_STD_MF_Y_V2(p, 1);
                 }
                 f->pressure = SS4_MF_Z_V2(p, 0) ? 0x30 : 0;
@@ -1239,16 +1249,27 @@ static int alps_decode_ss4_v2(struct alps_fields *f,
 
         case SS4_PACKET_ID_MULTI:
                 if (priv->flags & ALPS_BUTTONPAD) {
-                        f->mt[2].x = SS4_BTL_MF_X_V2(p, 0);
+                        if (IS_SS4PLUS_DEV(priv->dev_id)) {
+                                f->mt[0].x = SS4_PLUS_BTL_MF_X_V2(p, 0);
+                                f->mt[1].x = SS4_PLUS_BTL_MF_X_V2(p, 1);
+                        } else {
+                                f->mt[2].x = SS4_BTL_MF_X_V2(p, 0);
+                                f->mt[3].x = SS4_BTL_MF_X_V2(p, 1);
+                        }
+
                         f->mt[2].y = SS4_BTL_MF_Y_V2(p, 0);
-                        f->mt[3].x = SS4_BTL_MF_X_V2(p, 1);
                         f->mt[3].y = SS4_BTL_MF_Y_V2(p, 1);
                         no_data_x = SS4_MFPACKET_NO_AX_BL;
                         no_data_y = SS4_MFPACKET_NO_AY_BL;
                 } else {
-                        f->mt[2].x = SS4_STD_MF_X_V2(p, 0);
+                        if (IS_SS4PLUS_DEV(priv->dev_id)) {
+                                f->mt[0].x = SS4_PLUS_STD_MF_X_V2(p, 0);
+                                f->mt[1].x = SS4_PLUS_STD_MF_X_V2(p, 1);
+                        } else {
+                                f->mt[0].x = SS4_STD_MF_X_V2(p, 0);
+                                f->mt[1].x = SS4_STD_MF_X_V2(p, 1);
+                        }
                         f->mt[2].y = SS4_STD_MF_Y_V2(p, 0);
-                        f->mt[3].x = SS4_STD_MF_X_V2(p, 1);
                         f->mt[3].y = SS4_STD_MF_Y_V2(p, 1);
                         no_data_x = SS4_MFPACKET_NO_AX;
                         no_data_y = SS4_MFPACKET_NO_AY;
@@ -2541,8 +2562,8 @@ static int alps_set_defaults_ss4_v2(struct psmouse *psmouse,
 
         memset(otp, 0, sizeof(otp));
 
-        if (alps_get_otp_values_ss4_v2(psmouse, 0, &otp[0][0]) ||
-            alps_get_otp_values_ss4_v2(psmouse, 1, &otp[1][0]))
+        if (alps_get_otp_values_ss4_v2(psmouse, 1, &otp[1][0]) ||
+            alps_get_otp_values_ss4_v2(psmouse, 0, &otp[0][0]))
                 return -1;
 
         alps_update_device_area_ss4_v2(otp, priv);
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index ed2d6879fa52..c80a7c76cb76 100644
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -100,6 +100,10 @@ enum SS4_PACKET_ID {
                                  ((_b[1 + _i * 3]  << 5) & 0x1F00)      \
                                 )
 
+#define SS4_PLUS_STD_MF_X_V2(_b, _i) (((_b[0 + (_i) * 3] << 4) & 0x0070) | \
+                                 ((_b[1 + (_i) * 3]  << 4) & 0x0F80)    \
+                                )
+
 #define SS4_STD_MF_Y_V2(_b, _i) (((_b[1 + (_i) * 3] << 3) & 0x0010) |   \
                                  ((_b[2 + (_i) * 3] << 5) & 0x01E0) |   \
                                  ((_b[2 + (_i) * 3] << 4) & 0x0E00)     \
@@ -109,6 +113,10 @@ enum SS4_PACKET_ID {
                                  ((_b[0 + (_i) * 3] >> 3) & 0x0010)     \
                                 )
 
+#define SS4_PLUS_BTL_MF_X_V2(_b, _i) (SS4_PLUS_STD_MF_X_V2(_b, _i) |    \
+                                 ((_b[0 + (_i) * 3] >> 4) & 0x0008)     \
+                                )
+
 #define SS4_BTL_MF_Y_V2(_b, _i) (SS4_STD_MF_Y_V2(_b, _i) | \
                                  ((_b[0 + (_i) * 3] >> 3) & 0x0008)     \
                                 )
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 714cf7f9b138..cfbc8ba4c96c 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1247,6 +1247,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
         { "ELAN0000", 0 },
         { "ELAN0100", 0 },
         { "ELAN0600", 0 },
+        { "ELAN0602", 0 },
         { "ELAN0605", 0 },
         { "ELAN0608", 0 },
         { "ELAN0605", 0 },
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index 20b5b21c1bba..0871010f18d5 100644
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -265,7 +265,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, unsigned char *fir
         if (ps2_command(&psmouse->ps2dev, param, MAKE_PS2_CMD(0, 2, TP_READ_ID)))
                 return -1;
 
-        if (param[0] != TP_MAGIC_IDENT)
+        /* add new TP ID. */
+        if (!(param[0] & TP_MAGIC_IDENT))
                 return -1;
 
         if (firmware_id)
diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
index 5617ed3a7d7a..88055755f82e 100644
--- a/drivers/input/mouse/trackpoint.h
+++ b/drivers/input/mouse/trackpoint.h
@@ -21,8 +21,9 @@
 #define TP_COMMAND              0xE2    /* Commands start with this */
 
 #define TP_READ_ID              0xE1    /* Sent for device identification */
-#define TP_MAGIC_IDENT          0x01    /* Sent after a TP_READ_ID followed */
+#define TP_MAGIC_IDENT          0x03    /* Sent after a TP_READ_ID followed */
                                         /* by the firmware ID */
+                                        /* Firmware ID includes 0x1, 0x2, 0x3 */
 
 
 /*