Skip to content

Commit 80826e9

Browse files
committed
Merge tag 'input-for-v6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: - touchpads on HP 15-* laptops switched back to PS/2 emulation mode - a quirk for Clevo PCX0DX/TUXEDO XP1511 to make sure keyboard is responding after resume * tag 'input-for-v6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: i8042 - add Clevo PCX0DX to i8042 quirk table Revert "Input: synaptics - switch touchpad on HP Laptop 15-da3001TU to RMI mode"
2 parents 8039292 + 9c445d2 commit 80826e9

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

drivers/input/mouse/synaptics.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ static const char * const smbus_pnp_ids[] = {
192192
"SYN3221", /* HP 15-ay000 */
193193
"SYN323d", /* HP Spectre X360 13-w013dx */
194194
"SYN3257", /* HP Envy 13-ad105ng */
195-
"SYN3286", /* HP Laptop 15-da3001TU */
196195
NULL
197196
};
198197

drivers/input/serio/i8042-acpipnpio.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,6 +1238,13 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
12381238
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
12391239
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
12401240
},
1241+
{
1242+
.matches = {
1243+
DMI_MATCH(DMI_BOARD_NAME, "PCX0DX"),
1244+
},
1245+
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
1246+
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
1247+
},
12411248
{
12421249
.matches = {
12431250
DMI_MATCH(DMI_BOARD_NAME, "X170SM"),

0 commit comments

Comments
 (0)