summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-04-25 10:23:22 +0200
committerHans de Goede <hdegoede@redhat.com>2014-04-25 10:23:22 +0200
commit1003f8c87011875db615a92a3f45d84faf42270c (patch)
tree1f44a2b8c092f080b3f241276e9c33b5319a48fc
parent1d586d63765983f74402ddc188fe98f520839a16 (diff)
downloadkernel-1003f8c87011875db615a92a3f45d84faf42270c.tar.gz
kernel-1003f8c87011875db615a92a3f45d84faf42270c.tar.xz
kernel-1003f8c87011875db615a92a3f45d84faf42270c.zip
Add synaptics min-max quirk for ThinkPad Edge E431 (rhbz#1089689)
-rw-r--r--0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch33
-rw-r--r--kernel.spec9
2 files changed, 42 insertions, 0 deletions
diff --git a/0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch b/0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
new file mode 100644
index 000000000..03527a568
--- /dev/null
+++ b/0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
@@ -0,0 +1,33 @@
+From d1b9785eda70e7638927d294139c6d4796cb7ea6 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 22 Apr 2014 11:08:16 +0200
+Subject: [PATCH v3] synaptics: Add min/max quirk for ThinkPad Edge E431
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/input/mouse/synaptics.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index 7c9f509..93cc8fd 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -1566,6 +1566,14 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = {
+ .driver_data = (int []){1232, 5710, 1156, 4696},
+ },
+ {
++ /* Lenovo ThinkPad Edge E431 */
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad Edge E431"),
++ },
++ .driver_data = (int []){1024, 5022, 2508, 4832},
++ },
++ {
+ /* Lenovo ThinkPad T431s */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+--
+1.9.0
+
diff --git a/kernel.spec b/kernel.spec
index 28ac2c3b9..43121ac79 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -638,6 +638,9 @@ Patch25048: 0001-HID-rmi-introduce-RMI-driver-for-Synaptics-touchpads.patch
#rhbz 1089583
Patch25064: 0001-HID-rmi-do-not-handle-touchscreens-through-hid-rmi.patch
+#rhbz 1089689
+Patch25065: 0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1284,6 +1287,9 @@ ApplyPatch gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch
#rhbz 1025603
ApplyPatch disable-libdw-unwind-on-non-x86.patch
+#rhbz 1089689
+ApplyPatch 0001-synaptics-Add-min-max-quirk-for-ThinkPad-Edge-E431.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2064,6 +2070,9 @@ fi
# || ||
%changelog
* Fri Apr 25 2014 Hans de Goede <hdegoede@redhat.com>
+- Add synaptics min-max quirk for ThinkPad Edge E431 (rhbz#1089689)
+
+* Fri Apr 25 2014 Hans de Goede <hdegoede@redhat.com>
- Add a patch to add support for the mmc controller on sunxi ARM SoCs
* Thu Apr 24 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc2.git3.1