Input: synaptics - Lenovo X1 Carbon 5 devices should use SMBUS/RMI

Input: synaptics - Lenovo X1 Carbon 5 devices should use SMBUS/RMI

[Yiannis Marangos]

Hi,

Part of these patches were found at:
https://gist.github.com/ursm/6d1007f44a1d6beeb670b3c3a6a78ea4

They were tested in 4.12.8 for almost a month, in 4.13.2 for almost a month
and in 4.14-rc3. No problems were found.

Regards,
Yiannis.

[PATCH 1/2] Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3

[Yiannis Marangos]

Some synaptics devices such as LEN0073 they use SMBUS version 3.
---
 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;
-- 
2.14.1

[PATCH 2/2] Input: synaptics - Lenovo X1 Carbon 5 devices should use SMBUS/RMI

[Yiannis Marangos]

X1 Carbon 5 has two synaptics ids: LEN0072 and LEN0073.
---
 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..c9ab666e5ab1 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -172,6 +172,8 @@ static const char * const smbus_pnp_ids[] = {
 	"LEN0048", /* X1 Carbon 3 */
 	"LEN0046", /* X250 */
 	"LEN004a", /* W541 */
+	"LEN0072", /* X1 Carbon 5 */
+	"LEN0073", /* X1 Carbon 5 */
 	"LEN200f", /* T450s */
 	NULL
 };
-- 
2.14.1

Re: Input: synaptics - Lenovo X1 Carbon 5 devices should use SMBUS/RMI

[Damjan Georgievski]

> Part of these patches were found at:
> https://gist.github.com/ursm/6d1007f44a1d6beeb670b3c3a6a78ea4
>
> They were tested in 4.12.8 for almost a month, in 4.13.2 for almost a month
> and in 4.14-rc3. No problems were found.


I've been carying the
+       "LEN0072", /* X1 Carbon 5 */
change for some time in my own builds

but that one makes the trackpoint device appear late, typically 400
seconds after boot, sometimes it even doesn't appear at all until I
remove 'psmouse' and load it again


-- 
damjan

Re: Input: synaptics - Lenovo X1 Carbon 5 devices should use SMBUS/RMI

[Yiannis Marangos]

You will need the other part of the patch also.

Re: Input: synaptics - Lenovo X1 Carbon 5 devices should use SMBUS/RMI

[Damjan Georgievski]

On 5 October 2017 at 20:36, Yiannis Marangos <yiannis.marangos@gmail.com> wrote:
> You will need the other part of the patch also.

sorry,
what other part?

the `if (smbus_version != 2 && smbus_version != 3) {` one?
I added that too, didn't change anything.

just FYI, these are the patches I have over 4.13.5 now:
https://github.com/gdamjan/linux/commits/linux-4.13.y-carbon5


-- 
damjan

Re: Input: synaptics - Lenovo X1 Carbon 5 devices should use SMBUS/RMI

[Yiannis Marangos]

On Fri, Oct 06, 2017 at 12:20:06PM +0000, Damjan Georgievski wrote:
> sorry,
> what other part?
> 
> the `if (smbus_version != 2 && smbus_version != 3) {` one?
> I added that too, didn't change anything.

My bad. My X1 has LEN0073 and with this I don't have any problems. I will
resubmit my patches but only for LEN0073.

Thanks,
Yiannis.

Re: Input: synaptics - Lenovo X1 Carbon 5 devices should use SMBUS/RMI

[Damjan Georgievski]

>> Part of these patches were found at:
>> https://gist.github.com/ursm/6d1007f44a1d6beeb670b3c3a6a78ea4
>>
>> They were tested in 4.12.8 for almost a month, in 4.13.2 for almost a month
>> and in 4.14-rc3. No problems were found.
>
>
> I've been carying the
> +       "LEN0072", /* X1 Carbon 5 */
> change for some time in my own builds
>
> but that one makes the trackpoint device appear late, typically 400
> seconds after boot, sometimes it even doesn't appear at all until I
> remove 'psmouse' and load it again

I've found out now (2 out of 2 reboots) - that if I load the rmi_smbus
module before psmouse is loaded then the TrackPoint works fine as soon
as the psmouse module is loaded.

I load rmi_smbus statically from /etc/modules-load.d/mouse.conf.
psmouse is loaded automatically

Maybe a more global issue?


-- 
damjan

Input: synaptics - Lenovo X1 Carbon 5 devices should use SMBUS/RMI

[Yiannis Marangos]

Hi,

These patches were tested in 4.12.8 for almost a month, in 4.13.2 for almost
a month and in 4.14-rc3. No problems were found.

This is a resend of my previous email because the introductory message didn't
make it to the mailing list.

Regards,
Yiannis.

[PATCH 1/2] Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3

[Yiannis Marangos]

Some synaptics devices such as LEN0073 use SMBUS version 3.
---
 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;
-- 
2.14.1