Skip to content

Commit 436d219

Browse files
tuxedo-wsedtor
authored andcommitted
Input: i8042 - add additional TUXEDO devices to i8042 quirk tables
A lot of modern Clevo barebones have touchpad and/or keyboard issues after suspend fixable with nomux + reset + noloop + nopnp. Luckily, none of them have an external PS/2 port so this can safely be set for all of them. I'm not entirely sure if every device listed really needs all four quirks, but after testing and production use. No negative effects could be observed when setting all four. Signed-off-by: Werner Sembach <[email protected]> Reviewed-by: Hans de Goede <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent a63f777 commit 436d219

File tree

1 file changed

+68
-8
lines changed

1 file changed

+68
-8
lines changed

drivers/input/serio/i8042-x86ia64io.h

Lines changed: 68 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -900,14 +900,6 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
900900
},
901901
.driver_data = (void *)(SERIO_QUIRK_NOMUX)
902902
},
903-
{
904-
/* Clevo P650RS, 650RP6, Sager NP8152-S, and others */
905-
.matches = {
906-
DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),
907-
DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"),
908-
},
909-
.driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS)
910-
},
911903
{
912904
/* OQO Model 01 */
913905
.matches = {
@@ -1162,6 +1154,74 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
11621154
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
11631155
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
11641156
},
1157+
{
1158+
/*
1159+
* This is only a partial board_name and might be followed by
1160+
* another letter or number. DMI_MATCH however does do partial
1161+
* matching.
1162+
*/
1163+
.matches = {
1164+
DMI_MATCH(DMI_PRODUCT_NAME, "P65xH"),
1165+
},
1166+
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
1167+
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
1168+
},
1169+
{
1170+
/* Clevo P650RS, 650RP6, Sager NP8152-S, and others */
1171+
.matches = {
1172+
DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"),
1173+
},
1174+
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
1175+
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
1176+
},
1177+
{
1178+
/*
1179+
* This is only a partial board_name and might be followed by
1180+
* another letter or number. DMI_MATCH however does do partial
1181+
* matching.
1182+
*/
1183+
.matches = {
1184+
DMI_MATCH(DMI_PRODUCT_NAME, "P65_P67H"),
1185+
},
1186+
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
1187+
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
1188+
},
1189+
{
1190+
/*
1191+
* This is only a partial board_name and might be followed by
1192+
* another letter or number. DMI_MATCH however does do partial
1193+
* matching.
1194+
*/
1195+
.matches = {
1196+
DMI_MATCH(DMI_PRODUCT_NAME, "P65_67RP"),
1197+
},
1198+
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
1199+
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
1200+
},
1201+
{
1202+
/*
1203+
* This is only a partial board_name and might be followed by
1204+
* another letter or number. DMI_MATCH however does do partial
1205+
* matching.
1206+
*/
1207+
.matches = {
1208+
DMI_MATCH(DMI_PRODUCT_NAME, "P65_67RS"),
1209+
},
1210+
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
1211+
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
1212+
},
1213+
{
1214+
/*
1215+
* This is only a partial board_name and might be followed by
1216+
* another letter or number. DMI_MATCH however does do partial
1217+
* matching.
1218+
*/
1219+
.matches = {
1220+
DMI_MATCH(DMI_PRODUCT_NAME, "P67xRP"),
1221+
},
1222+
.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
1223+
SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
1224+
},
11651225
{
11661226
.matches = {
11671227
DMI_MATCH(DMI_BOARD_NAME, "PB50_70DFx,DDx"),

0 commit comments

Comments
 (0)