From 3c4171c06f22ef4ae16ce4b85595160e231945dc Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 14 Apr 2014 15:24:29 +0200 Subject: [PATCH] Add min/max quirks for various new Thinkpad touchpads (rhbz 1085582 1085697) --- ...n-max-quirk-for-ThinkPad-T431s-L440-.patch | 87 +++++++++++++++++++ kernel.spec | 9 ++ 2 files changed, 96 insertions(+) create mode 100644 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch diff --git a/0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch b/0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch new file mode 100644 index 000000000..04cbe5512 --- /dev/null +++ b/0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch @@ -0,0 +1,87 @@ +From 1d9820da2ba6e2794a283d709caf710d0a546b3c Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Thu, 10 Apr 2014 11:36:14 +0200 +Subject: [PATCH] synaptics: Add min/max quirk for ThinkPad T431s, L440, S1 + Yoga and X1 + +We expect that all the Haswell series will need such quirks, sigh. + +The T431s seems to be T430 hardware in a T440s case, using the T440s touchpad, +with the same min/max issue. + +The X1 Carbon 3rd generation name says 2nd while it is a 3rd generation. + +The X1 and T431s share a PnPID with the T540p, but the reported ranges are +closer to those of the T440s. + +HdG: Squashed 4 quirk patches into one. T431s + L440 are written by me, +S1 Yoga and X1 are written by Benjamin Tissoires. + +Signed-off-by: Benjamin Tissoires +Signed-off-by: Hans de Goede +--- + drivers/input/mouse/synaptics.c | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c +index b9d2259..521a8e7 100644 +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -1557,6 +1557,14 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = { + .driver_data = (int []){1232, 5710, 1156, 4696}, + }, + { ++ /* Lenovo ThinkPad T431s */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T431"), ++ }, ++ .driver_data = (int []){1024, 5112, 2024, 4832}, ++ }, ++ { + /* Lenovo ThinkPad T440s */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), +@@ -1565,6 +1573,14 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = { + .driver_data = (int []){1024, 5112, 2024, 4832}, + }, + { ++ /* Lenovo ThinkPad L440 */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L440"), ++ }, ++ .driver_data = (int []){1024, 5112, 2024, 4832}, ++ }, ++ { + /* Lenovo ThinkPad T540p */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), +@@ -1572,6 +1588,24 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = { + }, + .driver_data = (int []){1024, 5056, 2058, 4832}, + }, ++ { ++ /* Lenovo Yoga S1 */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, ++ "ThinkPad S1 Yoga"), ++ }, ++ .driver_data = (int []){1232, 5711, 1159, 4700}, ++ }, ++ { ++ /* Lenovo ThinkPad X1 Carbon Haswell (3rd generation) */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, ++ "ThinkPad X1 Carbon 2nd"), ++ }, ++ .driver_data = (int []){1131, 5113, 2021, 4831}, ++ }, + #endif + { } + }; +-- +1.9.0 + diff --git a/kernel.spec b/kernel.spec index f36bc5a4d..85a99e0af 100644 --- a/kernel.spec +++ b/kernel.spec @@ -639,6 +639,9 @@ Patch25062: 0001-HID-rmi-introduce-RMI-driver-for-Synaptics-touchpads.patch #CVE-2014-2851 rhbz 1086730 1087420 Patch25059: net-ipv4-current-group_info-should-be-put-after-using.patch +#rhbz 1085582 1085697 +Patch25063: 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch + # END OF PATCH DEFINITIONS %endif @@ -1287,6 +1290,9 @@ ApplyPatch 0001-HID-rmi-introduce-RMI-driver-for-Synaptics-touchpads.patch #CVE-2014-2851 rhbz 1086730 1087420 ApplyPatch net-ipv4-current-group_info-should-be-put-after-using.patch +#rhbz 1085582 1085697 +ApplyPatch 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch + # END OF PATCH APPLICATIONS %endif @@ -2066,6 +2072,9 @@ fi # ||----w | # || || %changelog +* Mon Apr 14 2014 Hans de Goede +- Add min/max quirks for various new Thinkpad touchpads (rhbz 1085582 1085697) + * Mon Apr 14 2014 Peter Robinson - Minor ARM config changes and cleanups for 3.15 merge window