rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patches for ThinkPad X1 Carbon Gen5 Touchpad (rhbz 1509461)

This commit is contained in:
Laura Abbott 2017-11-06 13:04:16 -08:00
parent 2608bff05a
commit aebca61f61
3 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -694,6 +694,10 @@ Patch633: net-mlxsw-reg-Add-high-and-low-temperature-thresholds.patch
# Included in 4.14, backport requested on kernel@
Patch634: selinux-Generalize-support-for-NNP-nosuid-SELinux-do.patch
# rhbz 1509461
Patch635: v3-1-2-Input-synaptics-rmi4---RMI4-can-also-use-SMBUS-version-3.patch
Patch636: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
# END OF PATCH DEFINITIONS
%endif
@ -2268,6 +2272,9 @@ fi
#
#
%changelog
* Mon Nov 06 2017 Laura Abbott <labbott@redhat.com>
- Patches for ThinkPad X1 Carbon Gen5 Touchpad (rhbz 1509461)
* Thu Nov 02 2017 Jeremy Cline <jeremy@jcline.org> - 4.13.11-200
- Linux v4.13.11
- Fix CVE-2017-12193 (rhbz 1501215 1508717)

42
v3-1-2-Input-synaptics-rmi4---RMI4-can-also-use-SMBUS-version-3.patch Normal file
View File

@ -0,0 +1,42 @@
From patchwork Sun Nov 5 17:09:50 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v3,1/2] Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3
From: Yiannis Marangos <yiannis.marangos@gmail.com>
X-Patchwork-Id: 10042385
Message-Id: <20171105170951.20261-2-yiannis.marangos@gmail.com>
To: linux-input@vger.kernel.org, dmitry.torokhov@gmail.com
Cc: Yiannis Marangos <yiannis.marangos@gmail.com>
Date: Sun, 5 Nov 2017 19:09:50 +0200
Some synaptics devices such as LEN0073 use SMBUS version 3.
Signed-off-by: Yiannis Marangos <yiannis.marangos@gmail.com>
Acked-by: Benjamin Tissoires <benjamion.tissoires@redhat.com>
---
drivers/input/rmi4/rmi_smbus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c
index 225025a0940c..b6ccf39c6a7b 100644
--- a/drivers/input/rmi4/rmi_smbus.c
+++ b/drivers/input/rmi4/rmi_smbus.c
@@ -312,7 +312,7 @@ static int rmi_smb_probe(struct i2c_client *client,
rmi_smb->xport.dev = &client->dev;
rmi_smb->xport.pdata = *pdata;
rmi_smb->xport.pdata.irq = client->irq;
- rmi_smb->xport.proto_name = "smb2";
+ rmi_smb->xport.proto_name = "smb";
rmi_smb->xport.ops = &rmi_smb_ops;
smbus_version = rmi_smb_get_version(rmi_smb);
@@ -322,7 +322,7 @@ static int rmi_smb_probe(struct i2c_client *client,
rmi_dbg(RMI_DEBUG_XPORT, &client->dev, "Smbus version is %d",
smbus_version);
- if (smbus_version != 2) {
+ if (smbus_version != 2 && smbus_version != 3) {
dev_err(&client->dev, "Unrecognized SMB version %d\n",
smbus_version);
return -ENODEV;

29
v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch Normal file
View File

@ -0,0 +1,29 @@
From patchwork Sun Nov 5 17:09:51 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v3,2/2] Input: synaptics - Lenovo X1 Carbon 5 should use SMBUS/RMI
From: Yiannis Marangos <yiannis.marangos@gmail.com>
X-Patchwork-Id: 10042387
Message-Id: <20171105170951.20261-3-yiannis.marangos@gmail.com>
To: linux-input@vger.kernel.org, dmitry.torokhov@gmail.com
Cc: Yiannis Marangos <yiannis.marangos@gmail.com>
Date: Sun, 5 Nov 2017 19:09:51 +0200
Signed-off-by: Yiannis Marangos <yiannis.marangos@gmail.com>
---
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 ee5466a374bf..b3c683a84d3f 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
};