From 9248d5d924916f56e7cbf69d1f1c1348dc313b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 29 Jan 2018 18:41:50 +0100 Subject: [PATCH] Add fixes for synaptics driver for new Thinkpads (X1 Carbon, X280) (cherry picked from commit d5d1a870da01b7ab0fed8580fa42170eff4e4762) --- ...ch-support-on-X1-Carbon-6th-and-X280.patch | 41 +++++++++++++++++++ ...ovo-X1-Carbon-5-should-use-SMBUS-RMI.patch | 28 +++++++++++++ series.conf | 5 +++ 3 files changed, 74 insertions(+) create mode 100644 patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch create mode 100644 patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch diff --git a/patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch b/patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch new file mode 100644 index 0000000..11cc1fe --- /dev/null +++ b/patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch @@ -0,0 +1,41 @@ +From patchwork Mon Oct 16 14:48:55 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: Input: synaptics - add Intertouch support on X1 Carbon 6th and X280 +From: Aaron Ma +X-Patchwork-Id: 10008513 +Message-Id: <1508165335-16738-1-git-send-email-aaron.ma@canonical.com> +To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, + dmitry.torokhov@gmail.com, aaron.ma@canonical.com +Date: Mon, 16 Oct 2017 22:48:55 +0800 + +Synaptics devices reported it has Intertouch support, +and it fails via PS/2 as following logs: + +psmouse serio2: Failed to reset mouse on synaptics-pt/serio0 +psmouse serio2: Failed to enable mouse on synaptics-pt/serio0 + +Set these new devices to use SMBus to fix this issue, +then they report SMBus version 3 is using, +patch: https://patchwork.kernel.org/patch/9989547/ enabled SMBus ver 3 and +makes synaptics devices work fine on SMBus mode. + +Signed-off-by: Aaron Ma +--- + drivers/input/mouse/synaptics.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c +index 5af0b7d200bc..da3a5e40e80c 100644 +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -173,6 +173,8 @@ static const char * const smbus_pnp_ids[] = { + "LEN004a", /* W541 */ + "LEN0073", /* X1 Carbon 5 */ + "LEN200f", /* T450s */ ++ "LEN0092", /* X1 Carbon 6 */ ++ "LEN0096", /* X280 */ + NULL + }; + diff --git a/patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch b/patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch new file mode 100644 index 0000000..490baa8 --- /dev/null +++ b/patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch @@ -0,0 +1,28 @@ +From patchwork Fri Oct 6 14:06:30 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v2,2/2] Input: synaptics - Lenovo X1 Carbon 5 should use SMBUS/RMI +From: Yiannis Marangos +X-Patchwork-Id: 9989549 +Message-Id: <20171006140630.6398-3-yiannis.marangos@gmail.com> +To: linux-input@vger.kernel.org +Cc: Yiannis Marangos +Date: Fri, 6 Oct 2017 17:06:30 +0300 + +--- + 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 5af0b7d200bc..eecb8872c1a5 100644 +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -172,6 +172,7 @@ static const char * const smbus_pnp_ids[] = { + "LEN0048", /* X1 Carbon 3 */ + "LEN0046", /* X250 */ + "LEN004a", /* W541 */ ++ "LEN0073", /* X1 Carbon 5 */ + "LEN200f", /* T450s */ + NULL + }; diff --git a/series.conf b/series.conf index d5c0500..9f7edb6 100644 --- a/series.conf +++ b/series.conf @@ -27,3 +27,8 @@ patches.xen/xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch # Fix for grant-table in PVH/HVM in 4.14 patches.xen/xen-Fix-set-clear-_foreign_p2m_mapping-on-autotransl.patch + +# Hardware-specific fixes, backported from newer kernel and/or developers branches +patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch +patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch +