Skip to content

Commit df10cc8

Browse files
jinglewudtor
authored andcommitted
Input: elan_i2c - fix detecting IAP version on older controllers
Older controllers in bootloader mode need a different command to retrieve the IAP version. Signed-off-by: Jingle Wu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent 40d8aa9 commit df10cc8

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

drivers/input/mouse/elan_i2c_i2c.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#define ETP_I2C_PRESSURE_CMD 0x010A
4545
#define ETP_I2C_IAP_VERSION_CMD 0x0110
4646
#define ETP_I2C_IC_TYPE_P0_CMD 0x0110
47+
#define ETP_I2C_IAP_VERSION_P0_CMD 0x0111
4748
#define ETP_I2C_SET_CMD 0x0300
4849
#define ETP_I2C_POWER_CMD 0x0307
4950
#define ETP_I2C_FW_CHECKSUM_CMD 0x030F
@@ -266,6 +267,7 @@ static int elan_i2c_get_version(struct i2c_client *client,
266267
{
267268
int error;
268269
u8 pattern_ver;
270+
u16 cmd;
269271
u8 val[3];
270272

271273
error = elan_i2c_get_pattern(client, &pattern_ver);
@@ -274,10 +276,14 @@ static int elan_i2c_get_version(struct i2c_client *client,
274276
return error;
275277
}
276278

277-
error = elan_i2c_read_cmd(client,
278-
iap ? ETP_I2C_IAP_VERSION_CMD :
279-
ETP_I2C_FW_VERSION_CMD,
280-
val);
279+
if (!iap)
280+
cmd = ETP_I2C_FW_VERSION_CMD;
281+
else if (pattern_ver == 0)
282+
cmd = ETP_I2C_IAP_VERSION_P0_CMD;
283+
else
284+
cmd = ETP_I2C_IAP_VERSION_CMD;
285+
286+
error = elan_i2c_read_cmd(client, cmd, val);
281287
if (error) {
282288
dev_err(&client->dev, "failed to get %s version: %d\n",
283289
iap ? "IAP" : "FW", error);

0 commit comments

Comments
 (0)