Commit 80826e90 authored Jan 29, 2023 by Linus Torvalds

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"

parents 80392928 9c445d26

drivers/input/mouse/synaptics.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,6 @@ static const char * const smbus_pnp_ids[] = {
		"SYN3221", /* HP 15-ay000 */
		"SYN323d", /* HP Spectre X360 13-w013dx */
		"SYN3257", /* HP Envy 13-ad105ng */
		"SYN3286", /* HP Laptop 15-da3001TU */
		NULL
		};

drivers/input/serio/i8042-acpipnpio.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -1238,6 +1238,13 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
		.driver_data = (void *)(SERIO_QUIRK_NOMUX \| SERIO_QUIRK_RESET_ALWAYS \|
		SERIO_QUIRK_NOLOOP \| SERIO_QUIRK_NOPNP)
		},
		{
		.matches = {
		DMI_MATCH(DMI_BOARD_NAME, "PCX0DX"),
		},
		.driver_data = (void *)(SERIO_QUIRK_NOMUX \| SERIO_QUIRK_RESET_ALWAYS \|
		SERIO_QUIRK_NOLOOP \| SERIO_QUIRK_NOPNP)
		},
		{
		.matches = {
		DMI_MATCH(DMI_BOARD_NAME, "X170SM"),