[kernel/f20] Sync min/max quirk patch with upstream to add a quirk for the ThinkPad L540

[Hans de Goede]

commit 8b5b8cffdcbb4a68691a151f4d126da07bac2ec0
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu May 1 17:07:56 2014 +0200

    Sync min/max quirk patch with upstream to add a quirk for the ThinkPad L540
    
      (rhbz 1088588)

 ...dd-min-max-quirk-for-ThinkPad-T431s-L440-.patch |   39 +++++++++++++-------
 kernel.spec                                        |    6 +++-
 2 files changed, 31 insertions(+), 14 deletions(-)
---
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
index 04cbe55..e722999 100644
--- a/0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch
+++ b/0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch
@@ -1,8 +1,8 @@
-From 1d9820da2ba6e2794a283d709caf710d0a546b3c Mon Sep 17 00:00:00 2001
+From 46a2986ebbe18757c2d8c352f8fb6e0f4f0754e3 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede at redhat.com>
-Date: Thu, 10 Apr 2014 11:36:14 +0200
-Subject: [PATCH] synaptics: Add min/max quirk for ThinkPad T431s, L440, S1
- Yoga and X1
+Date: Sat, 19 Apr 2014 22:31:18 -0700
+Subject: [PATCH] Input: synaptics - add min/max quirk for ThinkPad T431s,
+ L440, L540, S1 Yoga and X1
 
 We expect that all the Haswell series will need such quirks, sigh.
 
@@ -14,20 +14,25 @@ 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,
+HdG: Squashed 5 quirk patches into one. T431s + L440 + L540 are written by me,
 S1 Yoga and X1 are written by Benjamin Tissoires.
 
+Hdg: Standardized S1 Yoga and X1 values, Yoga uses the same touchpad as the
+X240, X1 uses the same touchpad as the T440.
+
+Cc: stable at vger.kernel.org
 Signed-off-by: Benjamin Tissoires <benjamin.tissoires at redhat.com>
 Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov at gmail.com>
 ---
- drivers/input/mouse/synaptics.c | 34 ++++++++++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
+ drivers/input/mouse/synaptics.c | 42 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
 
 diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index b9d2259..521a8e7 100644
+index 9d75410..ef9f491 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 = {
+@@ -1566,6 +1566,14 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = {
  		.driver_data = (int []){1232, 5710, 1156, 4696},
  	},
  	{
@@ -42,7 +47,7 @@ index b9d2259..521a8e7 100644
  		/* 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 = {
+@@ -1574,6 +1582,14 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = {
  		.driver_data = (int []){1024, 5112, 2024, 4832},
  	},
  	{
@@ -57,18 +62,26 @@ index b9d2259..521a8e7 100644
  		/* 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 = {
+@@ -1581,6 +1597,32 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = {
  		},
  		.driver_data = (int []){1024, 5056, 2058, 4832},
  	},
 +	{
++		/* Lenovo ThinkPad L540 */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L540"),
++		},
++		.driver_data = (int []){1024, 5112, 2024, 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},
++		.driver_data = (int []){1232, 5710, 1156, 4696},
 +	},
 +	{
 +		/* Lenovo ThinkPad X1 Carbon Haswell (3rd generation) */
@@ -77,7 +90,7 @@ index b9d2259..521a8e7 100644
 +			DMI_MATCH(DMI_PRODUCT_VERSION,
 +					"ThinkPad X1 Carbon 2nd"),
 +		},
-+		.driver_data = (int []){1131, 5113, 2021, 4831},
++		.driver_data = (int []){1024, 5112, 2024, 4832},
 +	},
  #endif
  	{ }
diff --git a/kernel.spec b/kernel.spec
index e7f9d86..cfb4d94 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -721,7 +721,7 @@ Patch25055: lib-percpu_counter.c-fix-bad-percpu-counter-state-du.patch
 #CVE-2014-2851 rhbz 1086730 1087420
 Patch25059: net-ipv4-current-group_info-should-be-put-after-using.patch
 
-#rhbz 1085582 1085697
+#rhbz 1085582 1085697 1088588
 Patch25060: 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch
 
 #rhbz 1074710
@@ -2274,6 +2274,10 @@ fi
 #                 ||     ||
 %changelog
 * Thu May  1 2014 Hans de Goede <hdegoede at redhat.com>
+- Sync min/max quirk patch with upstream to add a quirk for the ThinkPad L540
+  (rhbz 1088588)
+
+* Thu May  1 2014 Hans de Goede <hdegoede at redhat.com>
 - Add use_native_backlight quirk for 4 laptops (rhbz 983342 1093120)
 
 * Wed Apr 30 2014 Josh Boyer <jwboyer at fedoraproject.org>