Patches for ThinkPad X1 Carbon Gen5 Touchpad (rhbz 1509461)
This commit is contained in:
parent
58bc23f6c8
commit
63069dcfc0
@ -657,6 +657,10 @@ Patch622: 0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
|
||||
|
||||
Patch623: 0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch
|
||||
|
||||
# rhbz 1509461
|
||||
Patch624: v3-1-2-Input-synaptics-rmi4---RMI4-can-also-use-SMBUS-version-3.patch
|
||||
Patch625: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
@ -2211,6 +2215,9 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon Nov 06 2017 Laura Abbott <labbott@redhat.com>
|
||||
- Patches for ThinkPad X1 Carbon Gen5 Touchpad (rhbz 1509461)
|
||||
|
||||
* Mon Nov 06 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc8.git0.1
|
||||
- Linux v4.14-rc8
|
||||
|
||||
|
@ -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;
|
@ -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
|
||||
};
|
Loading…
Reference in New Issue
Block a user