AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 09:51:00 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Input: elan_i2c - fix detecting IAP version on older controllers

Browse Source 
Older controllers in bootloader mode need a different command to retrieve
the IAP version.

Signed-off-by: Jingle Wu <jingle.wu@emc.com.tw>
Link: https://lore.kernel.org/r/20200714105641.15151-1-jingle.wu@emc.com.tw
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jingle Wu 2020-07-15 22:02:19 -07:00 committed by Dmitry Torokhov
parent 40d8aa9713
commit df10cc8db1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/input/mouse/elan_i2c_i2c.c
View File

@ -44,6 +44,7 @@
#define ETP_I2C_PRESSURE_CMD 0x010A #define ETP_I2C_PRESSURE_CMD 0x010A
#define ETP_I2C_IAP_VERSION_CMD 0x0110 #define ETP_I2C_IAP_VERSION_CMD 0x0110
#define ETP_I2C_IC_TYPE_P0_CMD 0x0110 #define ETP_I2C_IC_TYPE_P0_CMD 0x0110
#define ETP_I2C_IAP_VERSION_P0_CMD 0x0111
#define ETP_I2C_SET_CMD 0x0300 #define ETP_I2C_SET_CMD 0x0300
#define ETP_I2C_POWER_CMD 0x0307 #define ETP_I2C_POWER_CMD 0x0307
#define ETP_I2C_FW_CHECKSUM_CMD 0x030F #define ETP_I2C_FW_CHECKSUM_CMD 0x030F
@ -266,6 +267,7 @@ static int elan_i2c_get_version(struct i2c_client *client,
{ {
int error; int error;
u8 pattern_ver; u8 pattern_ver;
u16 cmd;
u8 val[3]; u8 val[3];
error = elan_i2c_get_pattern(client, &pattern_ver); error = elan_i2c_get_pattern(client, &pattern_ver);
@ -274,10 +276,14 @@ static int elan_i2c_get_version(struct i2c_client *client,
return error; return error;
} }
error = elan_i2c_read_cmd(client, if (!iap)
iap ? ETP_I2C_IAP_VERSION_CMD : cmd = ETP_I2C_FW_VERSION_CMD;
ETP_I2C_FW_VERSION_CMD, else if (pattern_ver == 0)
val); cmd = ETP_I2C_IAP_VERSION_P0_CMD;
else
cmd = ETP_I2C_IAP_VERSION_CMD;
error = elan_i2c_read_cmd(client, cmd, val);
if (error) { if (error) {
dev_err(&client->dev, "failed to get %s version: %d\n", dev_err(&client->dev, "failed to get %s version: %d\n",
iap ? "IAP" : "FW", error); iap ? "IAP" : "FW", error);