tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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"

Linus Torvalds 80826e90 80392928

options
unified split
Changed files
+7 -1
drivers
input
mouse
synaptics.c
serio
i8042-acpipnpio.h
-1
drivers/input/mouse/synaptics.c
··· 192 192 "SYN3221", /* HP 15-ay000 */ 193 193 "SYN323d", /* HP Spectre X360 13-w013dx */ 194 194 "SYN3257", /* HP Envy 13-ad105ng */ 195 - "SYN3286", /* HP Laptop 15-da3001TU */ 196 195 NULL 197 196 }; 198 197
+7
drivers/input/serio/i8042-acpipnpio.h
··· 1240 1240 }, 1241 1241 { 1242 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 + }, 1248 + { 1249 + .matches = { 1243 1250 DMI_MATCH(DMI_BOARD_NAME, "X170SM"), 1244 1251 }, 1245 1252 .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |