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 48/63] input: atmel_mxt_ts: move bootloader probe from mxt_initialize()
Date: Fri, 16 Aug 2019 17:37:09 +0900 [thread overview]
Message-ID: <20190816083724.19341-4-jiada_wang@mentor.com> (raw)
In-Reply-To: <20190816083724.19341-1-jiada_wang@mentor.com>
From: Deepak Das <deepak_das@mentor.com>
Validity of bootloader address is now checked before checking the
bootloader status so mxt_lookup_bootloader_address() was moved
from mxt_probe_bootloader() to mxt_initialize().
Above changes added lot of bootloader mode verification code into
mxt_initialize() which made this function longer and unreadable.
mxt_bootloader_status() moves bootloader mode verification code from
mxt_initialize() to make it cleaner.
Signed-off-by: Deepak Das <deepak_das@mentor.com>
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 | 45 +++++++++++++++---------
1 file changed, 28 insertions(+), 17 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index dec9f2b2c64d..27b908a50b66 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -2917,6 +2917,32 @@ static void mxt_config_cb(const struct firmware *cfg, void *ctx)
release_firmware(cfg);
}
+static int mxt_bootloader_status(struct mxt_data *data)
+{
+ struct i2c_client *client = data->client;
+ int error;
+
+ error = mxt_lookup_bootloader_address(data, false);
+ if (error) {
+ dev_info(&client->dev,
+ "Bootloader address is not specified\n");
+ return error;
+ }
+ /* Check bootloader state */
+ error = mxt_probe_bootloader(data);
+ if (error) {
+ dev_info(&client->dev, "Trying alternate bootloader address\n");
+ mxt_lookup_bootloader_address(data, true);
+ error = mxt_probe_bootloader(data);
+ if (error) {
+ dev_err(&client->dev,
+ "Chip is not in appmode or bootloader mode\n");
+ return error;
+ }
+ }
+ return 0;
+}
+
static int mxt_initialize(struct mxt_data *data)
{
struct i2c_client *client = data->client;
@@ -2932,24 +2958,9 @@ static int mxt_initialize(struct mxt_data *data)
"info block read failed (%d), so try bootloader method\n",
error);
- error = mxt_lookup_bootloader_address(data, false);
- if (error) {
- dev_info(&client->dev,
- "Bootloader address is not specified\n");
+ error = mxt_bootloader_status(data);
+ if (error)
return error;
- }
- /* Check bootloader state */
- error = mxt_probe_bootloader(data);
- if (error) {
- dev_info(&client->dev, "Trying alternate bootloader address\n");
- mxt_lookup_bootloader_address(data, true);
- error = mxt_probe_bootloader(data);
- if (error) {
- dev_err(&client->dev,
- "Chip is not in appmode or bootloader mode\n");
- return error;
- }
- }
/* OK, we are in bootloader, see if we can recover */
if (++recovery_attempts > 1) {
--
2.19.2
next prev parent reply other threads:[~2019-08-16 8:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 8:37 [PATCH v1 45/63] Input: Atmel: improve error handling in mxt_start() Jiada Wang
2019-08-16 8:37 ` [PATCH v1 46/63] Input: Atmel: improve error handling in mxt_initialize() Jiada Wang
2019-08-16 8:37 ` [PATCH v1 47/63] Input: Atmel: improve error handling in mxt_update_cfg() Jiada Wang
2019-08-16 8:37 ` Jiada Wang [this message]
2019-08-16 8:37 ` [PATCH v1 49/63] Input: Atmel: Improve error handling in mxt_initialize_input_device() 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=20190816083724.19341-4-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).