diff options
| author | Joel Kenny <jkenny@nvidia.com> | 2011-09-02 15:35:42 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:36 -0800 |
| commit | f7b2a737ff608e14a97f5941e50d707ad94d8786 (patch) | |
| tree | f8c64d47ce010e6815f0f2e1222ac28aee8b00da /drivers/input | |
| parent | 220f331446a02bac02a7246c3e668602612749ac (diff) | |
input: touch: atmel_mxt_ts: Prevent touchscreen from becoming unresponsive in some situations
BUG 868649
Reviewed-on: http://git-master/r/50598
(cherry picked from commit ad1dbe0eda931f813b20d75400daaa9edf18c82a)
Change-Id: I29f353687c499ff830e98fcf038d8a786dc5608b
Reviewed-on: http://git-master/r/54841
Reviewed-by: Joel Kenny <jkenny@nvidia.com>
Reviewed-by: Robert Collins <rcollins@nvidia.com>
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Tested-by: Joel Kenny <jkenny@nvidia.com>
Rebase-Id: Rdde94e071f4a27250eccad562c819ca2f537ffcd
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 94ed484ad748..775b3c2cc2a0 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -801,13 +801,13 @@ static int mxt_check_reg_init(struct mxt_data *data) MXT_BACKUP_VALUE); msleep(MXT_BACKUP_TIME); do { - error = mxt_read_object(data, MXT_GEN_COMMAND_T6, + error = mxt_read_object(data, MXT_GEN_COMMAND_T6, MXT_COMMAND_BACKUPNV, &command_register); - if (error) - return error; + if (error) + return error; msleep(2); - } while ((command_register != 0) && (timeout_counter++ <= 100)); + } while ((command_register != 0) && (timeout_counter++ <= 100)); if (timeout_counter >= 100) { dev_err(&client->dev, "No response after backup!\n"); return -EIO; @@ -970,6 +970,13 @@ static int mxt_initialize(struct mxt_data *data) &actv_cycle_time); if (error) return error; + + dev_info(&client->dev, "in mxt_initialize(), Active Cycle Time: %d Idle Cycle Time: %d\n", + actv_cycle_time, idle_cycle_time); + + data->actv_cycle_time = actv_cycle_time; + data->idle_cycle_time = idle_cycle_time; + dev_info(&client->dev, "Family ID: %d Variant ID: %d Version: %d Build: %d\n", info->family_id, info->variant_id, info->version, @@ -1157,6 +1164,10 @@ static void mxt_start(struct mxt_data *data) { int error; struct device *dev = &data->client->dev; + + if (data->is_stopped == 0) + return; + dev_info(dev, "in MXT_START(), idle time: %d %d", data->idle_cycle_time, data->actv_cycle_time); /* Restore the cycle time settings to wake from sleep */ error = mxt_write_object(data, MXT_GEN_POWER_T7, MXT_POWER_ACTVACQINT, @@ -1219,9 +1230,15 @@ i2c_error: static int mxt_input_open(struct input_dev *dev) { - /* struct mxt_data *data = input_get_drvdata(dev); - */ + u8 n; + + /* A dummy read to wake up the chip */ + mxt_read_object(data, MXT_GEN_POWER_T7, MXT_POWER_IDLEACQINT, &n); + msleep(MXT_WAKEUP_TIME); + + mxt_start(data); + return 0; } |