Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-21 09:11:55 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-21 09:12:06 +0100
commit7b850203f429ddc8b843f07d6cbc8ac7945a2350 (patch)
tree7dba7accf7c59d35f69d851f6c0e9eef375d25cb
parent701686778a52b3e34ea4fdce0105e30b28006a33 (diff)
Input: elan_i2c - add ACPI ID for touchpad in Lenovo V330-15ISK
(bsc#1051510).
-rw-r--r--patches.drivers/Input-elan_i2c-add-ACPI-ID-for-touchpad-in-Lenovo-V3.patch35
-rw-r--r--series.conf1
2 files changed, 36 insertions, 0 deletions
diff --git a/patches.drivers/Input-elan_i2c-add-ACPI-ID-for-touchpad-in-Lenovo-V3.patch b/patches.drivers/Input-elan_i2c-add-ACPI-ID-for-touchpad-in-Lenovo-V3.patch
new file mode 100644
index 0000000000..665bb06920
--- /dev/null
+++ b/patches.drivers/Input-elan_i2c-add-ACPI-ID-for-touchpad-in-Lenovo-V3.patch
@@ -0,0 +1,35 @@
+From 7ad222b3aed350adfc27ee7eec4587ffe55dfdce Mon Sep 17 00:00:00 2001
+From: Mauro Ciancio <mauro@acadeu.com>
+Date: Mon, 14 Jan 2019 10:24:53 -0300
+Subject: [PATCH] Input: elan_i2c - add ACPI ID for touchpad in Lenovo V330-15ISK
+Git-commit: 7ad222b3aed350adfc27ee7eec4587ffe55dfdce
+Patch-mainline: v5.0-rc7
+References: bsc#1051510
+
+This adds ELAN0617 to the ACPI table to support Elan touchpad found in
+Lenovo V330-15ISK.
+
+Signed-off-by: Mauro Ciancio <mauro@acadeu.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/input/mouse/elan_i2c_core.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
+index a94b6494e71a..225ae6980182 100644
+--- a/drivers/input/mouse/elan_i2c_core.c
++++ b/drivers/input/mouse/elan_i2c_core.c
+@@ -1345,6 +1345,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
+ { "ELAN060C", 0 },
+ { "ELAN0611", 0 },
+ { "ELAN0612", 0 },
++ { "ELAN0617", 0 },
+ { "ELAN0618", 0 },
+ { "ELAN061C", 0 },
+ { "ELAN061D", 0 },
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 253c3fbfeb..30fd2b1914 100644
--- a/series.conf
+++ b/series.conf
@@ -20393,6 +20393,7 @@
patches.drivers/Input-bma150-register-input-device-after-setting-pri.patch
patches.drivers/Input-elantech-enable-3rd-button-support-on-Fujitsu-.patch
patches.drivers/Revert-Input-elan_i2c-add-ACPI-ID-for-touchpad-in-AS.patch
+ patches.drivers/Input-elan_i2c-add-ACPI-ID-for-touchpad-in-Lenovo-V3.patch
patches.drivers/i2c-cadence-Fix-the-hold-bit-setting.patch
patches.drivers/i2c-bcm2835-Clear-current-buffer-pointers-and-counts.patch
patches.fixes/mac80211-Restore-vif-beacon-interval-if-start-ap-fai.patch