summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Reichel <sebastian.reichel@collabora.co.uk>2018-05-24 09:33:36 -0700
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-11-29 13:54:11 +0100
commit029aecd56607c0eb960c7a7901431b77bd10b798 (patch)
tree16147100e1f0b09ac3f54a696abdcf675b470764
parente9f9e559a6fd641634c488d1f811e2bc1b45587c (diff)
Input: atmel_mxt_ts - fix reset-gpio for level based irqs
The current reset-gpio support triggers an interrupt storm on platforms using the maxtouch with level based interrupt. The Motorola Droid 4, which I used for some of the tests is not affected, since it uses a edge based interrupt. This change avoids the interrupt storm by enabling the device while its interrupt is disabled. Afterwards we wait 100ms. This is important for two reasons: The device is unresponsive for some time (~22ms for mxt224E) and the CHG (interrupt) line is not working properly for 100ms. We don't need to wait for any following interrupts, since the following mxt_initialize() checks for bootloader mode anyways. This fixes a boot issue on GE PPD (watchdog kills device due to interrupt storm) and does not cause regression on Motorola Droid 4. Fixes: f657b00df22e ("Input: atmel_mxt_ts - add support for reset line") Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Reviewed-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> (cherry picked from commit ca1cd36cef00260db6b35b32d863e0c580c0488d) Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com> (cherry picked from commit 40af4dba5fe9c14bd254fde06b1f64f8c0348974)
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c20
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 5815a70..281ef11 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);