projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 48141445 GKH |
1 | From ad8fb554f04e38f155c9bc34bbf521fc592ceee7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Benjamin Tissoires <benjamin.tissoires@redhat.com> | |
| 3 | Date: Tue, 22 May 2018 17:16:08 -0700 | |
| 4 | Subject: Input: synaptics - add Lenovo 80 series ids to SMBus | |
| 5 | ||
| 6 | From: Benjamin Tissoires <benjamin.tissoires@redhat.com> | |
| 7 | ||
| 8 | commit ad8fb554f04e38f155c9bc34bbf521fc592ceee7 upstream. | |
| 9 | ||
| 10 | This time, Lenovo decided to go with different pieces in its latest | |
| 11 | series of Thinkpads. | |
| 12 | ||
| 13 | For those we have been able to test: | |
| 14 | - the T480 is using Synaptics with an IBM trackpoint | |
| 15 | -> it behaves properly with or without intertouch, there is no point | |
| 16 | not using RMI4 | |
| 17 | - the X1 Carbon 6th gen is using Synaptics with an IBM trackpoint | |
| 18 | -> the touchpad doesn't behave properly under PS/2 so we have to | |
| 19 | switch it to RMI4 if we do not want to have disappointed users | |
| 20 | - the X280 is using Synaptics with an ALPS trackpoint | |
| 21 | -> the recent fixes in the trackpoint handling fixed it so upstream | |
| 22 | now works fine with or without RMI4, and there is no point not | |
| 23 | using RMI4 | |
| 24 | - the T480s is using an Elan touchpad, so that's a different story | |
| 25 | ||
| 26 | Cc: <stable@vger.kernel.org> # v4.14.x, v4.15.x, v4.16.x | |
| 27 | Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> | |
| 28 | Acked-by: KT Liao <kt.liao@emc.com.tw> | |
| 29 | Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> | |
| 30 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 31 | ||
| 32 | --- | |
| 33 | drivers/input/mouse/synaptics.c | 2 ++ | |
| 34 | 1 file changed, 2 insertions(+) | |
| 35 | ||
| 36 | --- a/drivers/input/mouse/synaptics.c | |
| 37 | +++ b/drivers/input/mouse/synaptics.c | |
| 38 | @@ -172,10 +172,12 @@ static const char * const smbus_pnp_ids[ | |
| 39 | "LEN0048", /* X1 Carbon 3 */ | |
| 40 | "LEN0046", /* X250 */ | |
| 41 | "LEN004a", /* W541 */ | |
| 42 | + "LEN0071", /* T480 */ | |
| 43 | "LEN0072", /* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */ | |
| 44 | "LEN0073", /* X1 Carbon G5 (Elantech) */ | |
| 45 | "LEN0092", /* X1 Carbon 6 */ | |
| 46 | "LEN0096", /* X280 */ | |
| 47 | + "LEN0097", /* X280 -> ALPS trackpoint */ | |
| 48 | "LEN200f", /* T450s */ | |
| 49 | NULL | |
| 50 | }; |