diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 5815a705fc0a..281ef11b4071 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -193,6 +193,8 @@ enum t100_type { /* Delay times */ #define MXT_BACKUP_TIME 50 /* msec */ +#define MXT_RESET_GPIO_TIME 20 /* msec */ +#define MXT_RESET_INVALID_CHG 100 /* msec */ #define MXT_RESET_TIME 200 /* msec */ #define MXT_RESET_TIMEOUT 3000 /* msec */ #define MXT_CRC_TIMEOUT 1000 /* msec */ @@ -1194,7 +1196,7 @@ static int mxt_soft_reset(struct mxt_data *data) return ret; /* Ignore CHG line for 100ms after reset */ - msleep(100); + msleep(MXT_RESET_INVALID_CHG); mxt_acquire_irq(data); @@ -3145,20 +3147,12 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id) return error; } - data->in_bootloader = true; - msleep(MXT_RESET_TIME); - reinit_completion(&data->bl_completion); - __gpio_set_value(pdata->gpio_reset, 1); - error = mxt_wait_for_completion(data, &data->bl_completion, - MXT_RESET_TIMEOUT); - if (error) { - gpio_free(pdata->gpio_reset); - return error; - } - data->in_bootloader = false; - disable_irq(client->irq); + msleep(MXT_RESET_GPIO_TIME); + __gpio_set_value(pdata->gpio_reset, 1); + msleep(MXT_RESET_INVALID_CHG); + error = mxt_initialize(data); if (error) { gpio_free(pdata->gpio_reset); |