Merge branch 'next' into for-linus

Prepare input updates for 4.16 merge window.

5 files changed, 32 insertions, 59 deletions

diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c
index fd8865c65caf..dfd3873513e4 100644
--- a/drivers/input/mouse/cyapa.c
+++ b/drivers/input/mouse/cyapa.c
@@ -740,7 +740,7 @@ static ssize_t cyapa_show_suspend_scanrate(struct device *dev,
                                            char *buf)
 {
         struct cyapa *cyapa = dev_get_drvdata(dev);
-        u8 pwr_cmd = cyapa->suspend_power_mode;
+        u8 pwr_cmd;
         u16 sleep_time;
         int len;
         int error;
diff --git a/drivers/input/mouse/cyapa_gen3.c b/drivers/input/mouse/cyapa_gen3.c
index 1cbfa4a6e830..076dda4a66da 100644
--- a/drivers/input/mouse/cyapa_gen3.c
+++ b/drivers/input/mouse/cyapa_gen3.c
@@ -137,49 +137,6 @@ static const u8 bl_exit[] = { 0x00, 0xff, 0xa5, 0x00, 0x01, 0x02, 0x03, 0x04,
 
 
  /* for byte read/write command */
-#define CMD_RESET      0
-#define CMD_POWER_MODE 1
-#define CMD_DEV_STATUS 2
-#define CMD_REPORT_MAX_BASELINE 3
-#define CMD_REPORT_MIN_BASELINE 4
-#define SMBUS_BYTE_CMD(cmd) (((cmd) & 0x3f) << 1)
-#define CYAPA_SMBUS_RESET         SMBUS_BYTE_CMD(CMD_RESET)
-#define CYAPA_SMBUS_POWER_MODE    SMBUS_BYTE_CMD(CMD_POWER_MODE)
-#define CYAPA_SMBUS_DEV_STATUS    SMBUS_BYTE_CMD(CMD_DEV_STATUS)
-#define CYAPA_SMBUS_MAX_BASELINE  SMBUS_BYTE_CMD(CMD_REPORT_MAX_BASELINE)
-#define CYAPA_SMBUS_MIN_BASELINE  SMBUS_BYTE_CMD(CMD_REPORT_MIN_BASELINE)
-
- /* for group registers read/write command */
-#define REG_GROUP_DATA 0
-#define REG_GROUP_CMD 2
-#define REG_GROUP_QUERY 3
-#define SMBUS_GROUP_CMD(grp) (0x80 | (((grp) & 0x07) << 3))
-#define CYAPA_SMBUS_GROUP_DATA   SMBUS_GROUP_CMD(REG_GROUP_DATA)
-#define CYAPA_SMBUS_GROUP_CMD    SMBUS_GROUP_CMD(REG_GROUP_CMD)
-#define CYAPA_SMBUS_GROUP_QUERY  SMBUS_GROUP_CMD(REG_GROUP_QUERY)
-
- /* for register block read/write command */
-#define CMD_BL_STATUS 0
-#define CMD_BL_HEAD 1
-#define CMD_BL_CMD 2
-#define CMD_BL_DATA 3
-#define CMD_BL_ALL 4
-#define CMD_BLK_PRODUCT_ID 5
-#define CMD_BLK_HEAD 6
-#define SMBUS_BLOCK_CMD(cmd) (0xc0 | (((cmd) & 0x1f) << 1))
-
-/* register block read/write command in bootloader mode */
-#define CYAPA_SMBUS_BL_STATUS  SMBUS_BLOCK_CMD(CMD_BL_STATUS)
-#define CYAPA_SMBUS_BL_HEAD    SMBUS_BLOCK_CMD(CMD_BL_HEAD)
-#define CYAPA_SMBUS_BL_CMD     SMBUS_BLOCK_CMD(CMD_BL_CMD)
-#define CYAPA_SMBUS_BL_DATA    SMBUS_BLOCK_CMD(CMD_BL_DATA)
-#define CYAPA_SMBUS_BL_ALL     SMBUS_BLOCK_CMD(CMD_BL_ALL)
-
-/* register block read/write command in operational mode */
-#define CYAPA_SMBUS_BLK_PRODUCT_ID SMBUS_BLOCK_CMD(CMD_BLK_PRODUCT_ID)
-#define CYAPA_SMBUS_BLK_HEAD SMBUS_BLOCK_CMD(CMD_BLK_HEAD)
-
- /* for byte read/write command */
 #define CMD_RESET 0
 #define CMD_POWER_MODE 1
 #define CMD_DEV_STATUS 2
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 2111a85d0b17..75e757520ef0 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -42,7 +42,6 @@
 #include "elan_i2c.h"
 
 #define DRIVER_NAME             "elan_i2c"
-#define ELAN_DRIVER_VERSION     "1.6.3"
 #define ELAN_VENDOR_ID          0x04f3
 #define ETP_MAX_PRESSURE        255
 #define ETP_FWIDTH_REDUCE       90
@@ -1294,4 +1293,3 @@ module_i2c_driver(elan_driver);
 MODULE_AUTHOR("Duson Lin <dusonlin@emc.com.tw>");
 MODULE_DESCRIPTION("Elan I2C/SMBus Touchpad driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(ELAN_DRIVER_VERSION);
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 6a5649e52eed..8ac9e03c05b4 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -975,6 +975,21 @@ static void psmouse_apply_defaults(struct psmouse *psmouse)
         psmouse->pt_deactivate = NULL;
 }
 
+static bool psmouse_do_detect(int (*detect)(struct psmouse *, bool),
+                              struct psmouse *psmouse, bool allow_passthrough,
+                              bool set_properties)
+{
+        if (psmouse->ps2dev.serio->id.type == SERIO_PS_PSTHRU &&
+            !allow_passthrough) {
+                return false;
+        }
+
+        if (set_properties)
+                psmouse_apply_defaults(psmouse);
+
+        return detect(psmouse, set_properties) == 0;
+}
+
 static bool psmouse_try_protocol(struct psmouse *psmouse,
                                  enum psmouse_type type,
                                  unsigned int *max_proto,
@@ -986,15 +1001,8 @@ static bool psmouse_try_protocol(struct psmouse *psmouse,
         if (!proto)
                 return false;
 
-        if (psmouse->ps2dev.serio->id.type == SERIO_PS_PSTHRU &&
-            !proto->try_passthru) {
-                return false;
-        }
-
-        if (set_properties)
-                psmouse_apply_defaults(psmouse);
-
-        if (proto->detect(psmouse, set_properties) != 0)
+        if (!psmouse_do_detect(proto->detect, psmouse, proto->try_passthru,
+                               set_properties))
                 return false;
 
         if (set_properties && proto->init && init_allowed) {
@@ -1027,8 +1035,8 @@ static int psmouse_extensions(struct psmouse *psmouse,
          * Always check for focaltech, this is safe as it uses pnp-id
          * matching.
          */
-        if (psmouse_try_protocol(psmouse, PSMOUSE_FOCALTECH,
-                                 &max_proto, set_properties, false)) {
+        if (psmouse_do_detect(focaltech_detect,
+                              psmouse, false, set_properties)) {
                 if (max_proto > PSMOUSE_IMEX &&
                     IS_ENABLED(CONFIG_MOUSE_PS2_FOCALTECH) &&
                     (!set_properties || focaltech_init(psmouse) == 0)) {
@@ -1074,8 +1082,8 @@ static int psmouse_extensions(struct psmouse *psmouse,
          * probing for IntelliMouse.
          */
         if (max_proto > PSMOUSE_PS2 &&
-            psmouse_try_protocol(psmouse, PSMOUSE_SYNAPTICS, &max_proto,
-                                 set_properties, false)) {
+            psmouse_do_detect(synaptics_detect,
+                              psmouse, false, set_properties)) {
                 synaptics_hardware = true;
 
                 if (max_proto > PSMOUSE_IMEX) {
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index cd9f61cb3fc6..3d2e23a0ae39 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -1281,6 +1281,16 @@ static void set_input_params(struct psmouse *psmouse,
                                     INPUT_MT_POINTER |
                                     (cr48_profile_sensor ?
                                         INPUT_MT_TRACK : INPUT_MT_SEMI_MT));
+
+                /*
+                 * For semi-mt devices we send ABS_X/Y ourselves instead of
+                 * input_mt_report_pointer_emulation. But
+                 * input_mt_init_slots() resets the fuzz to 0, leading to a
+                 * filtered ABS_MT_POSITION_X but an unfiltered ABS_X
+                 * position. Let's re-initialize ABS_X/Y here.
+                 */
+                if (!cr48_profile_sensor)
+                        set_abs_position_params(dev, &priv->info, ABS_X, ABS_Y);
         }
 
         if (SYN_CAP_PALMDETECT(info->capabilities))