Skip to content

Commit c1a5135

Browse files
committed
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
2 parents d91a46d + 19a5d9b commit c1a5135

1 file changed

Lines changed: 18 additions & 0 deletions

File tree

drivers/input/serio/i8042-acpipnpio.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,17 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
115115
},
116116
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_NEVER)
117117
},
118+
{
119+
/*
120+
* ASUS Zenbook UX425QA_UM425QA
121+
* Some Zenbooks report "Zenbook" with a lowercase b.
122+
*/
123+
.matches = {
124+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
125+
DMI_MATCH(DMI_PRODUCT_NAME, "Zenbook UX425QA_UM425QA"),
126+
},
127+
.driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER | SERIO_QUIRK_RESET_NEVER)
128+
},
118129
{
119130
/* ASUS ZenBook UX425UA/QA */
120131
.matches = {
@@ -1176,6 +1187,13 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
11761187
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
11771188
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
11781189
},
1190+
{
1191+
.matches = {
1192+
DMI_MATCH(DMI_BOARD_NAME, "WUJIE Series-X5SP4NAG"),
1193+
},
1194+
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
1195+
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
1196+
},
11791197
/*
11801198
* A lot of modern Clevo barebones have touchpad and/or keyboard issues
11811199
* after suspend fixable with the forcenorestore quirk.

0 commit comments

Comments
 (0)