Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-08-03 14:05:12 +0200
committerTakashi Iwai <tiwai@suse.de>2018-08-03 14:05:21 +0200
commit788c257f64b087cd9fd00ad9ca26e47fd5300313 (patch)
tree68b14bcd0e96d03d146f5be2b5cecbe28d3b3118
parent63e7044ef5e76c8c4eb1431887b8328fa46d3272 (diff)
Input: elan_i2c - add another ACPI ID for Lenovo Ideapad
330-15AST (bsc#1051510).
-rw-r--r--patches.drivers/Input-elan_i2c-add-another-ACPI-ID-for-Lenovo-Ideapa36
-rw-r--r--series.conf1
2 files changed, 37 insertions, 0 deletions
diff --git a/patches.drivers/Input-elan_i2c-add-another-ACPI-ID-for-Lenovo-Ideapa b/patches.drivers/Input-elan_i2c-add-another-ACPI-ID-for-Lenovo-Ideapa
new file mode 100644
index 0000000000..bb52e376c3
--- /dev/null
+++ b/patches.drivers/Input-elan_i2c-add-another-ACPI-ID-for-Lenovo-Ideapa
@@ -0,0 +1,36 @@
+From 6f88a6439da5d94de334a341503bc2c7f4a7ea7f Mon Sep 17 00:00:00 2001
+From: KT Liao <kt.liao@emc.com.tw>
+Date: Mon, 16 Jul 2018 12:10:03 +0000
+Subject: [PATCH] Input: elan_i2c - add another ACPI ID for Lenovo Ideapad 330-15AST
+Git-commit: 6f88a6439da5d94de334a341503bc2c7f4a7ea7f
+Patch-mainline: v4.18-rc7
+References: bsc#1051510
+
+Add ELAN0622 to ACPI mapping table to support Elan touchpad found in
+Ideapad 330-15AST.
+
+Signed-off-by: KT Liao <kt.liao@emc.com.tw>
+Reported-by: Anant Shende <anantshende@gmail.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 e26d8c7d131d..f5ae24865355 100644
+--- a/drivers/input/mouse/elan_i2c_core.c
++++ b/drivers/input/mouse/elan_i2c_core.c
+@@ -1347,6 +1347,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
+ { "ELAN0612", 0 },
+ { "ELAN0618", 0 },
+ { "ELAN061D", 0 },
++ { "ELAN0622", 0 },
+ { "ELAN1000", 0 },
+ { }
+ };
+--
+2.18.0
+
diff --git a/series.conf b/series.conf
index d03ea86f97..43317584aa 100644
--- a/series.conf
+++ b/series.conf
@@ -15269,6 +15269,7 @@
patches.drivers/usb-gadget-f_fs-Only-return-delayed-status-when-len-.patch
patches.drivers/usb-core-handle-hub-C_PORT_OVER_CURRENT-condition.patch
patches.drivers/Input-elan_i2c-add-ACPI-ID-for-lenovo-ideapad-330
+ patches.drivers/Input-elan_i2c-add-another-ACPI-ID-for-Lenovo-Ideapa
patches.drivers/nvmet-fc-fix-target-sgl-list-on-large-transfers.patch
patches.fixes/nvme-if_ready-checks-to-fail-io-to-deleting-controll.patch