summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdvard Holst <edvard.holst@gmail.com>2018-02-03 11:46:15 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-06-05 11:41:56 +0200
commitaf504c5a88b3fca04855dd0868d33b7ec3025261 (patch)
treeb3f04df5ed08f209ad1a7502dfb0f5daf24548a0
parent88859f6cc5c41ec8235a9eb36f6c3f2a13f3ee26 (diff)
downloadlinux-af504c5a88b3fca04855dd0868d33b7ec3025261.tar.gz
linux-af504c5a88b3fca04855dd0868d33b7ec3025261.tar.bz2
linux-af504c5a88b3fca04855dd0868d33b7ec3025261.zip
Input: synaptics - Lenovo Thinkpad X1 Carbon G5 (2017) with Elantech trackpoints should use RMI
commit 15e2cffec3aa0d47a8d75ae80e1b136bfb5dff30 upstream. Lenovo use two different trackpoints in the fifth generation Thinkpad X1 Carbon. Both are accessible over SMBUS/RMI but the pnpIDs are missing. This patch is for the Elantech trackpoint specifically which also reports SMB version 3 so rmi_smbus needs to be updated in order to handle it. For the record, I was not the first one to come up with this patch as it has been floating around the internet for a while now. However, I have spent significant time with testing and my efforts to find the original author of the patch have been unsuccessful. Signed-off-by: Edvard Holst <edvard.holst@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/input/mouse/synaptics.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 0eca3fd9e5f3..d2b14feef2db 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -173,6 +173,7 @@ static const char * const smbus_pnp_ids[] = {
"LEN0046", /* X250 */
"LEN004a", /* W541 */
"LEN0072", /* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */
+ "LEN0073", /* X1 Carbon G5 (Elantech) */
"LEN200f", /* T450s */
NULL
};