Commit c1a5135e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'input-for-v6.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:

 - a couple of quirks to i8042 to enable keyboard on a Asus and MECHREVO
   laptops

* tag 'input-for-v6.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: i8042 - add quirks for MECHREVO Wujie 15X Pro
  Input: i8042 - add quirk for ASUS Zenbook UX425QA_UM425QA
parents d91a46d6 19a5d9ba

drivers/input/serio/i8042-acpipnpio.h

+18 −0
Original line number Diff line number Diff line
@@ -115,6 +115,17 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { 
		},

		.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_NEVER)

	},

	{

		/*

		 * ASUS Zenbook UX425QA_UM425QA

		 * Some Zenbooks report "Zenbook" with a lowercase b.

		 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Zenbook UX425QA_UM425QA"),

		},

		.driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER | SERIO_QUIRK_RESET_NEVER)

	},

	{

		/* ASUS ZenBook UX425UA/QA */

		.matches = {
@@ -1176,6 +1187,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, "WUJIE Series-X5SP4NAG"),

		},

		.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |

					SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)

	},

	/*

	 * A lot of modern Clevo barebones have touchpad and/or keyboard issues

	 * after suspend fixable with the forcenorestore quirk.