Input: elantech - detect middle button based on firmware version

Looks like the new generation of Lenovo machine also need to
be added to the PnPID whitelist. This is definitively not going
to scale, as there is nothing that tells us currently if a
touchpad supports a true physical middle button.

Consider that all new touchpads that are not clickpads
(so matching ETP_NEW_IC_SMBUS_HOST_NOTIFY) are handling 3 physical
buttons.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index d2829dc5999c45e5e1f072c0a27f54bcc1386145..057a3cf01eecd20e5f402495a6e3ef5ecbb97cc8 100644 (file)
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1107,16 +1107,6 @@ static const struct dmi_system_id elantech_dmi_has_middle_button[] = {
        { }
 };
 
-static const char * const middle_button_pnp_ids[] = {
-       "LEN2131", /* ThinkPad P52 w/ NFC */
-       "LEN2132", /* ThinkPad P52 */
-       "LEN2133", /* ThinkPad P72 w/ NFC */
-       "LEN2134", /* ThinkPad P72 */
-       "LEN0407",
-       "LEN0408",
-       NULL
-};
-
 /*
  * Set the appropriate event bits for the input subsystem
  */
@@ -1135,8 +1125,7 @@ static int elantech_set_input_params(struct psmouse *psmouse)
        __clear_bit(EV_REL, dev->evbit);
 
        __set_bit(BTN_LEFT, dev->keybit);
-       if (dmi_check_system(elantech_dmi_has_middle_button) ||
-                       psmouse_matches_pnp_id(psmouse, middle_button_pnp_ids))
+       if (info->has_middle_button)
                __set_bit(BTN_MIDDLE, dev->keybit);
        __set_bit(BTN_RIGHT, dev->keybit);
 
@@ -1750,6 +1739,11 @@ static int elantech_query_info(struct psmouse *psmouse,
                break;
        }
 
+       /* check for the middle button: DMI matching or new v4 firmwares */
+       info->has_middle_button = dmi_check_system(elantech_dmi_has_middle_button) ||
+                                 (ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version) &&
+                                  !elantech_is_buttonpad(info));
+
        return 0;
 }
 

diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
index 194503ed59c532d11f2d4906e957c438c6663f43..16174b54ffc37dedbecc099e1bc4a309f958c80a 100644 (file)
--- a/drivers/input/mouse/elantech.h
+++ b/drivers/input/mouse/elantech.h
@@ -158,6 +158,7 @@ struct elantech_device_info {
        bool crc_enabled;
        bool set_hw_resolution;
        bool has_trackpoint;
+       bool has_middle_button;
        int (*send_cmd)(struct psmouse *psmouse, unsigned char c,
                        unsigned char *param);
 };