Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-01-18 17:24:15 +0100
committerTakashi Iwai <tiwai@suse.de>2019-01-18 17:24:25 +0100
commitfb98cf5a4f1ac55ebd1712cedfc7a406b0c084a4 (patch)
tree781ca2e0d18354072f7d1ac800f2bee6ca1531cb
parent9f8015ba1d125e2736b321b2b8b7c3bfaa3b8560 (diff)
Input: synaptics - enable RMI on ThinkPad T560 (bsc#1051510).
-rw-r--r--patches.drivers/Input-synaptics-enable-RMI-on-ThinkPad-T560.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.drivers/Input-synaptics-enable-RMI-on-ThinkPad-T560.patch b/patches.drivers/Input-synaptics-enable-RMI-on-ThinkPad-T560.patch
new file mode 100644
index 0000000000..7d786e7be6
--- /dev/null
+++ b/patches.drivers/Input-synaptics-enable-RMI-on-ThinkPad-T560.patch
@@ -0,0 +1,37 @@
+From ca5047286c9c93a01e1f471d00a6019536992954 Mon Sep 17 00:00:00 2001
+From: Yussuf Khalil <dev@pp3345.net>
+Date: Sat, 8 Dec 2018 20:13:35 -0800
+Subject: [PATCH] Input: synaptics - enable RMI on ThinkPad T560
+Git-commit: ca5047286c9c93a01e1f471d00a6019536992954
+Patch-mainline: v4.20
+References: bsc#1051510
+
+Before commit 7fd6d98b89f3 ("i2c: i801: Allow ACPI AML access I/O
+ports not reserved for SMBus"), enabling RMI on the T560 would cause
+the touchpad to stop working after resuming from suspend. Now that
+this issue is fixed, RMI can be enabled safely and works fine.
+
+Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Yussuf Khalil <dev@pp3345.net>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/input/mouse/synaptics.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index 2bd5bb11c8ba..7bdf8fc2c3b5 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -171,6 +171,7 @@ static const char * const smbus_pnp_ids[] = {
+ "LEN0046", /* X250 */
+ "LEN004a", /* W541 */
+ "LEN005b", /* P50 */
++ "LEN005e", /* T560 */
+ "LEN0071", /* T480 */
+ "LEN0072", /* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */
+ "LEN0073", /* X1 Carbon G5 (Elantech) */
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index c9dfc037f9..6ff8f3b6a0 100644
--- a/series.conf
+++ b/series.conf
@@ -19601,6 +19601,7 @@
patches.drivers/gpio-max7301-fix-driver-for-use-with-CONFIG_VMAP_STA.patch
patches.drivers/gpio-mvebu-only-fail-on-missing-clk-if-pwm-is-actual.patch
patches.drivers/Input-omap-keypad-fix-idle-configuration-to-not-bloc.patch
+ patches.drivers/Input-synaptics-enable-RMI-on-ThinkPad-T560.patch
patches.drm/0001-drm-ioctl-Fix-Spectre-v1-vulnerabilities.patch
patches.fixes/x86-mm-Fix-decoy-address-handling-vs-32-bit-builds.patch
patches.drm/0001-drm-rockchip-psr-do-not-dereference-encoder-before-i.patch