From: Tom Rini <trini@konsulko.com>
To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Olof Johansson <olof@lixom.net>,
Nick Dyer <nick.dyer@itdev.co.uk>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Henrik Rydberg <rydberg@bitmath.org>
Subject: [PATCH] Revert "Input: atmel_mxt_ts - disable interrupt for 50ms after reset"
Date: Thu, 7 Apr 2016 18:52:25 -0400 [thread overview]
Message-ID: <1460069545-10322-1-git-send-email-trini@konsulko.com> (raw)
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@lixom.net>
Cc: Nick Dyer <nick.dyer@itdev.co.uk>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Henrik Rydberg <rydberg@bitmath.org>
Signed-off-by: Tom Rini <trini@konsulko.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
next reply other threads:[~2016-04-07 22:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-07 22:52 Tom Rini [this message]
2016-04-08 9:10 ` [PATCH] Revert "Input: atmel_mxt_ts - disable interrupt for 50ms after reset" Nick Dyer
2016-04-08 12:14 ` Tom Rini
2016-04-08 12:26 ` Nick Dyer
2016-04-08 12:39 ` Tom Rini
2016-04-08 21:30 ` Nick Dyer
2016-04-08 23:30 ` Tom Rini
2016-04-11 9:31 ` [PATCH] Input: atmel_mxt_ts - use mxt_acquire_irq in mxt_soft_reset Nick Dyer
2016-04-25 21:28 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460069545-10322-1-git-send-email-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nick.dyer@itdev.co.uk \
--cc=olof@lixom.net \
--cc=rydberg@bitmath.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).