Input: elan_i2c - Correct the value of ic_type for old and new pattern of firmware
Subsystems (2)
PATCH 1/3 Input: elan_i2c - Correct the value of ic_type for old and new pattern of firmware
Get the correct value of ic_type for old and new pattern of firmware.
Signed-off-by Dave Wang <[email protected]>
--- drivers/input/mouse/elan_i2c_core.c | 15 +++++---------- drivers/input/mouse/elan_i2c_i2c.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 12 deletions(-)
drivers/input/mouse/elan_i2c_core.c +5 -10
@@ -6,7 +6,7 @@* * Author: 林政維 (Duson Lin) <[email protected]> * Author: KT Liao <[email protected]> -* Version: 1.6.3 +* Version: 1.6.4 * * Based on cyapa driver: * copyright (c) 2011-2012 Cypress Semiconductor, Inc.
@@ -100,10 +100,11 @@ struct elan_tp_data {bool middle_button; }; -static int elan_get_fwinfo (u16 ic_type,u16 *validpage_count, +static int elan_get_fwinfo (struct elan_tp_data *data, +u16 *validpage_count,u16 *signature_address) { -switch (ic_type) { +switch (data->ic_type) {case 0x00 :case 0x06 :case 0x08 :
@@ -312,7 +313,6 @@ static int elan_initialize(struct elan_tp_data *data)static int elan_query_device_info (struct elan_tp_data *data) {int error; -u16 ic_type; error = data->ops->get_version (data->client, false, &data->fw_version);if (error)
@@ -336,12 +336,7 @@ static int elan_query_device_info(struct elan_tp_data *data)if (error)return error; -if (data->pattern ==0x01 ) - ic_type = data->ic_type; -else - ic_type = data->iap_version; - - error =elan_get_fwinfo (ic_type, &data->fw_validpage_count, + error =elan_get_fwinfo (data, &data->fw_validpage_count, &data->fw_signature_address);if (error) dev_warn(&data->client->dev,
drivers/input/mouse/elan_i2c_i2c.c +9 -2
@@ -298,7 +298,7 @@ static int elan_i2c_get_sm_version(struct i2c_client *client,return error; } -if (pattern_ver ==0x01 ) { +if (pattern_ver >=0x01 ) { error =elan_i2c_read_cmd (client,ETP_I2C_IC_TYPE_CMD , val);if (error) { dev_err(&client->dev, "failed to get ic type: %d\n",
@@ -324,7 +324,14 @@ static int elan_i2c_get_sm_version(struct i2c_client *client,return error; } *version = val[0 ]; - *ic_type = val[1 ]; + + error =elan_i2c_read_cmd (client,ETP_I2C_IAP_VERSION_CMD , val); +if (error) { +dev_err (&client->dev,"failed to get ic type: %d\n" , + error); +return error; + } + *ic_type = val[0 ]; error =elan_i2c_read_cmd (client,ETP_I2C_NSM_VERSION_CMD , val);
Signature · 1 line
2.17.1