diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2019-09-06 12:51:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-09-06 12:51:15 +0200 |
| commit | 3716d346e9fe202af82396eb2550d4cfb7dd23b4 (patch) | |
| tree | 9b6c1c910ed7eb289aa3aa6b6d22d72bba5c8ce3 | |
| parent | 544e55161db3574e626e4f1eafd1c6bf9a016b7e (diff) | |
| parent | e7d2672c66e4d3675570369bf20856296da312c4 (diff) | |
Merge 4.19.71 into android-4.19-qASB-2020-02-05_4.19-q-releaseASB-2020-01-05_4.19-q-releaseASB-2019-12-05_4.19-q-releaseASB-2019-11-05_4.19-q-releaseASB-2019-10-05_4.19-q-releaseASB-2019-09-05_4.19-q
Changes in 4.19.71
Revert "Input: elantech - enable SMBus on new (2018+) systems"
Linux 4.19.71
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4a7427ca04e312145dd45493d371db71b80d70af
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | drivers/input/mouse/elantech.c | 54 |
2 files changed, 30 insertions, 26 deletions
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 70 +SUBLEVEL = 71 EXTRAVERSION = NAME = "People's Front" diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index eb9b9de47fd1..530142b5a115 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1810,30 +1810,6 @@ static int elantech_create_smbus(struct psmouse *psmouse, leave_breadcrumbs); } -static bool elantech_use_host_notify(struct psmouse *psmouse, - struct elantech_device_info *info) -{ - if (ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version)) - return true; - - switch (info->bus) { - case ETP_BUS_PS2_ONLY: - /* expected case */ - break; - case ETP_BUS_SMB_HST_NTFY_ONLY: - case ETP_BUS_PS2_SMB_HST_NTFY: - /* SMbus implementation is stable since 2018 */ - if (dmi_get_bios_year() >= 2018) - return true; - default: - psmouse_dbg(psmouse, - "Ignoring SMBus bus provider %d\n", info->bus); - break; - } - - return false; -} - /** * elantech_setup_smbus - called once the PS/2 devices are enumerated * and decides to instantiate a SMBus InterTouch device. @@ -1853,7 +1829,7 @@ static int elantech_setup_smbus(struct psmouse *psmouse, * i2c_blacklist_pnp_ids. * Old ICs are up to the user to decide. */ - if (!elantech_use_host_notify(psmouse, info) || + if (!ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version) || psmouse_matches_pnp_id(psmouse, i2c_blacklist_pnp_ids)) return -ENXIO; } @@ -1873,6 +1849,34 @@ static int elantech_setup_smbus(struct psmouse *psmouse, return 0; } +static bool elantech_use_host_notify(struct psmouse *psmouse, + struct elantech_device_info *info) +{ + if (ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version)) + return true; + + switch (info->bus) { + case ETP_BUS_PS2_ONLY: + /* expected case */ + break; + case ETP_BUS_SMB_ALERT_ONLY: + /* fall-through */ + case ETP_BUS_PS2_SMB_ALERT: + psmouse_dbg(psmouse, "Ignoring SMBus provider through alert protocol.\n"); + break; + case ETP_BUS_SMB_HST_NTFY_ONLY: + /* fall-through */ + case ETP_BUS_PS2_SMB_HST_NTFY: + return true; + default: + psmouse_dbg(psmouse, + "Ignoring SMBus bus provider %d.\n", + info->bus); + } + + return false; +} + int elantech_init_smbus(struct psmouse *psmouse) { struct elantech_device_info info; |