Skip to content

Commit 3f8f770

Browse files
stephan-ghdtor
authored andcommitted
Input: mms114 - fix handling of mms345l
MMS345L is another first generation touch screen from Melfas, which uses the same registers as MMS152. However, using I2C_M_NOSTART for it causes errors when reading: i2c i2c-0: sendbytes: NAK bailout. mms114 0-0048: __mms114_read_reg: i2c transfer failed (-5) The driver works fine as soon as I2C_M_NOSTART is removed. Reviewed-by: Andi Shyti <[email protected]> Signed-off-by: Stephan Gerhold <[email protected]> Link: https://lore.kernel.org/r/[email protected] [dtor: removed separate mms345l handling, made everyone use standard transfer mode, propagated the 10bit addressing flag to the read part of the transfer as well.] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent f27ad89 commit 3f8f770

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

drivers/input/touchscreen/mms114.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ static int __mms114_read_reg(struct mms114_data *data, unsigned int reg,
9191
if (reg <= MMS114_MODE_CONTROL && reg + len > MMS114_MODE_CONTROL)
9292
BUG();
9393

94-
/* Write register: use repeated start */
94+
/* Write register */
9595
xfer[0].addr = client->addr;
96-
xfer[0].flags = I2C_M_TEN | I2C_M_NOSTART;
96+
xfer[0].flags = client->flags & I2C_M_TEN;
9797
xfer[0].len = 1;
9898
xfer[0].buf = &buf;
9999

100100
/* Read data */
101101
xfer[1].addr = client->addr;
102-
xfer[1].flags = I2C_M_RD;
102+
xfer[1].flags = (client->flags & I2C_M_TEN) | I2C_M_RD;
103103
xfer[1].len = len;
104104
xfer[1].buf = val;
105105

@@ -428,10 +428,8 @@ static int mms114_probe(struct i2c_client *client,
428428
const void *match_data;
429429
int error;
430430

431-
if (!i2c_check_functionality(client->adapter,
432-
I2C_FUNC_PROTOCOL_MANGLING)) {
433-
dev_err(&client->dev,
434-
"Need i2c bus that supports protocol mangling\n");
431+
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
432+
dev_err(&client->dev, "Not supported I2C adapter\n");
435433
return -ENODEV;
436434
}
437435

0 commit comments

Comments
 (0)