[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1460069545-10322-1-git-send-email-trini@konsulko.com>
Date: Thu, 7 Apr 2016 18:52:25 -0400
From: Tom Rini <trini@...sulko.com>
To: linux-input@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Olof Johansson <olof@...om.net>, Nick Dyer <nick.dyer@...ev.co.uk>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Henrik Rydberg <rydberg@...math.org>
Subject: [PATCH] Revert "Input: atmel_mxt_ts - disable interrupt for 50ms after reset"
This reverts commit 885f3fb9fa1f9e185e8a4e905157087495734349 due to this
change breaking the touchpad on the Chromebook Pixel 2015 on resume from
sleep or warm resets.
Cc: Olof Johansson <olof@...om.net>
Cc: Nick Dyer <nick.dyer@...ev.co.uk>
Cc: Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc: Henrik Rydberg <rydberg@...math.org>
Signed-off-by: Tom Rini <trini@...sulko.com>
---
drivers/input/touchscreen/atmel_mxt_ts.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 2160512..9b92b60 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1098,9 +1098,7 @@ static int mxt_soft_reset(struct mxt_data *data)
struct device *dev = &data->client->dev;
int ret = 0;
- dev_info(dev, "Resetting device\n");
-
- disable_irq(data->irq);
+ dev_info(dev, "Resetting chip\n");
reinit_completion(&data->reset_completion);
@@ -1108,11 +1106,6 @@ static int mxt_soft_reset(struct mxt_data *data)
if (ret)
return ret;
- /* Ignore CHG line for 100ms after reset */
- msleep(100);
-
- enable_irq(data->irq);
-
ret = mxt_wait_for_completion(data, &data->reset_completion,
MXT_RESET_TIMEOUT);
if (ret)
--
1.7.9.5
Powered by blists - more mailing lists