mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 16:15:11 +00:00
Code Issues Releases Wiki Activity

Input: iqs5xx - close bootloader using hardware reset

Browse source 
The bootloader can be closed using the 'execute' command (0x02) or
hardware reset. Rather than using the former option for successful
firmware update procedures and reserving the latter for recovering
the device upon failure, simply use hardware reset for all cases.

The post-bootloader initialization delay increases marginally when
triggered by a hardware reset, so increase the wait time to ensure
the device does not subsequently fail to respond.

As part of this change, refactor the return path to avoid an extra
assignment and to make the logic a bit smaller.

Signed-off-by: Jeff LaBundy <jeff@labundy.com>
Link: https://lore.kernel.org/r/20210313191236.4366-6-jeff@labundy.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jeff LaBundy 2021-03-21 21:04:17 -07:00 committed by Dmitry Torokhov
parent e7d8e88aec
commit 95a6d96140
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/input/touchscreen/iqs5xx.c
View file

@ -832,7 +832,7 @@ static int iqs5xx_fw_file_parse(struct i2c_client *client,
static int iqs5xx_fw_file_write(struct i2c_client *client, const char *fw_file)
{
struct iqs5xx_private *iqs5xx = i2c_get_clientdata(client);
int error, error_bl = 0;
int error, error_init = 0;
u8 *pmap;
if (iqs5xx->dev_id_info.bl_status == IQS5XX_BL_STATUS_NONE)
@ -875,21 +875,14 @@ static int iqs5xx_fw_file_write(struct i2c_client *client, const char *fw_file)
error = iqs5xx_bl_verify(client, IQS5XX_CSTM,
pmap + IQS5XX_CHKSM_LEN + IQS5XX_APP_LEN,
IQS5XX_CSTM_LEN);
if (error)
goto err_reset;
error = iqs5xx_bl_cmd(client, IQS5XX_BL_CMD_EXEC, 0);
err_reset:
if (error) {
iqs5xx_reset(client);
usleep_range(10000, 10100);
}
iqs5xx_reset(client);
usleep_range(15000, 15100);
error_bl = error;
error = iqs5xx_dev_init(client);
if (!error && !iqs5xx->dev_id_info.bl_status)
error = -EINVAL;
error_init = iqs5xx_dev_init(client);
if (!iqs5xx->dev_id_info.bl_status)
error_init = error_init ? : -EINVAL;
enable_irq(client->irq);
@ -898,10 +891,7 @@ static int iqs5xx_fw_file_write(struct i2c_client *client, const char *fw_file)
err_kfree:
kfree(pmap);
if (error_bl)
return error_bl;
return error;
return error ? : error_init;
}
static ssize_t fw_file_store(struct device *dev,