From: Jiada Wang <jiada_wang@mentor.com>
To: <nick@shmanahar.org>, <dmitry.torokhov@gmail.com>
Cc: <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<jiada_wang@mentor.com>, <george_davis@mentor.com>
Subject: [PATCH v1 25/63] Input: atmel_mxt_ts - rename bl_completion to chg_completion
Date: Fri, 16 Aug 2019 17:33:37 +0900 [thread overview]
Message-ID: <20190816083415.18819-1-jiada_wang@mentor.com> (raw)
From: Nick Dyer <nick.dyer@itdev.co.uk>
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
(cherry picked from ndyer/linux/for-upstream commit dda8453bfb44216645ede798918a314d4fca2481)
[gdavis: Resolve forward port conflicts due to applying upstream
commit 96a938aa214e ("Input: atmel_mxt_ts - remove platform
data support").]
Signed-off-by: George G. Davis <george_davis@mentor.com>
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
drivers/input/touchscreen/atmel_mxt_ts.c | 27 ++++++++++++------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index a7805df83af2..6f185bc5128c 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -381,9 +381,6 @@ struct mxt_data {
u8 T100_reportid_max;
u16 T107_address;
- /* for fw update in bootloader */
- struct completion bl_completion;
-
/* for reset handling */
struct completion reset_completion;
@@ -395,6 +392,9 @@ struct mxt_data {
enum mxt_suspend_mode suspend_mode;
+ /* for power up handling */
+ struct completion chg_completion;
+
/* Indicates whether device is in suspend */
bool suspended;
@@ -611,7 +611,7 @@ static int mxt_check_bootloader(struct mxt_data *data, struct mxt_flash *f)
* CHG assertion before reading the status byte.
* Once the status byte has been read, the line is deasserted.
*/
- ret = mxt_wait_for_completion(data, &data->bl_completion,
+ ret = mxt_wait_for_completion(data, &data->chg_completion,
MXT_FW_CHG_TIMEOUT);
if (ret) {
/*
@@ -1400,11 +1400,10 @@ static irqreturn_t mxt_interrupt(int irq, void *dev_id)
{
struct mxt_data *data = dev_id;
- if (data->in_bootloader) {
- /* bootloader state transition completion */
- complete(&data->bl_completion);
+ complete(&data->chg_completion);
+
+ if (data->in_bootloader)
return IRQ_HANDLED;
- }
if (!data->object_table)
return IRQ_HANDLED;
@@ -2164,9 +2163,9 @@ static void mxt_regulator_enable(struct mxt_data *data)
msleep(MXT_CHG_DELAY);
retry_wait:
- reinit_completion(&data->bl_completion);
+ reinit_completion(&data->chg_completion);
data->in_bootloader = true;
- error = mxt_wait_for_completion(data, &data->bl_completion,
+ error = mxt_wait_for_completion(data, &data->chg_completion,
MXT_POWERON_DELAY);
if (error == -EINTR)
goto retry_wait;
@@ -3330,7 +3329,7 @@ static int mxt_enter_bootloader(struct mxt_data *data)
enable_irq(data->irq);
}
- reinit_completion(&data->bl_completion);
+ reinit_completion(&data->chg_completion);
return 0;
}
@@ -3366,7 +3365,7 @@ static int mxt_load_fw(struct device *dev)
}
/* Wait for flash. */
- ret = mxt_wait_for_completion(data, &data->bl_completion,
+ ret = mxt_wait_for_completion(data, &data->chg_completion,
MXT_FW_RESET_TIME);
if (ret)
goto disable_irq;
@@ -3377,7 +3376,7 @@ static int mxt_load_fw(struct device *dev)
* the CHG line after bootloading has finished, so ignore potential
* errors.
*/
- mxt_wait_for_completion(data, &data->bl_completion, MXT_FW_RESET_TIME);
+ mxt_wait_for_completion(data, &data->chg_completion, MXT_FW_RESET_TIME);
data->in_bootloader = false;
disable_irq:
@@ -3771,7 +3770,7 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
data->irq = client->irq;
i2c_set_clientdata(client, data);
- init_completion(&data->bl_completion);
+ init_completion(&data->chg_completion);
init_completion(&data->reset_completion);
init_completion(&data->crc_completion);
--
2.19.2
next reply other threads:[~2019-08-16 8:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 8:33 Jiada Wang [this message]
2019-08-16 8:33 ` [PATCH v1 26/63] Input: atmel_mxt_ts - make bootloader interrupt driven Jiada Wang
2019-08-16 8:33 ` [PATCH v1 27/63] Input: atmel_mxt_ts - delay enabling IRQ when not using regulators Jiada Wang
2019-08-16 8:33 ` [PATCH v1 28/63] Input: atmel_mxt_ts - implement I2C retries Jiada Wang
2019-08-16 8:33 ` [PATCH v1 29/63] Input: atmel_mxt_ts - orientation is not present in hover Jiada Wang
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=20190816083415.18819-1-jiada_wang@mentor.com \
--to=jiada_wang@mentor.com \
--cc=dmitry.torokhov@gmail.com \
--cc=george_davis@mentor.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nick@shmanahar.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).