diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-10-18 18:42:32 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-10-18 18:42:32 -0700 |
| commit | bb0bc0cfeabc0d6865865e8d3a601bea6711f951 (patch) | |
| tree | f5321f28b6ea9c557316980226c6139a45a3aec9 /drivers/input/mouse | |
| parent | Input: i8042 - add nopnp quirk for Acer Aspire 5 A515 (diff) | |
| parent | Input: Add MAINTAINERS entry for SiS i2c touch input driver (diff) | |
| download | linux-dev-bb0bc0cfeabc0d6865865e8d3a601bea6711f951.tar.xz linux-dev-bb0bc0cfeabc0d6865865e8d3a601bea6711f951.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.10 merge window.
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 4b81b2d0fe06..82577095e175 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -179,12 +179,14 @@ static const char * const smbus_pnp_ids[] = { "LEN0093", /* T480 */ "LEN0096", /* X280 */ "LEN0097", /* X280 -> ALPS trackpoint */ - "LEN0099", /* X1 Extreme 1st */ + "LEN0099", /* X1 Extreme Gen 1 / P1 Gen 1 */ "LEN009b", /* T580 */ + "LEN0402", /* X1 Extreme Gen 2 / P1 Gen 2 */ "LEN200f", /* T450s */ "LEN2044", /* L470 */ "LEN2054", /* E480 */ "LEN2055", /* E580 */ + "LEN2068", /* T14 Gen 1 */ "SYN3052", /* HP EliteBook 840 G4 */ "SYN3221", /* HP 15-ay000 */ "SYN323d", /* HP Spectre X360 13-w013dx */ @@ -1752,7 +1754,7 @@ static int synaptics_create_intertouch(struct psmouse *psmouse, .kernel_tracking = false, .topbuttonpad = topbuttonpad, }, - .f30_data = { + .gpio_data = { .buttonpad = SYN_CAP_CLICKPAD(info->ext_cap_0c), .trackstick_buttons = !!SYN_CAP_EXT_BUTTONS_STICK(info->ext_cap_10), |