Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 385deb96 authored by Nick Dyer's avatar Nick Dyer Committed by Dmitry Torokhov
Browse files

Input: atmel_mxt_ts - handle bootloader previously unlocked 



On a warm probe, the device might be in a state where an flash operation was
not completed.

Signed-off-by: default avatarNick Dyer <nick.dyer@itdev.co.uk>
Acked-by: default avatarBenson Leung <bleung@chromium.org>
Acked-by: default avatarYufeng Shen <miletus@chromium.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent a9fdd1e6

drivers/input/touchscreen/atmel_mxt_ts.c

+18 −9
Original line number Diff line number Diff line
@@ -449,14 +449,15 @@ static u8 mxt_get_bootloader_version(struct mxt_data *data, u8 val) 
	}

}



static int mxt_check_bootloader(struct mxt_data *data, unsigned int state)

static int mxt_check_bootloader(struct mxt_data *data, unsigned int state,

				bool wait)

{

	struct device *dev = &data->client->dev;

	u8 val;

	int ret;



recheck:

	if (state != MXT_WAITING_BOOTLOAD_CMD) {

	if (wait) {

		/*

		 * In application update mode, the interrupt

		 * line signals state transitions. We must wait for the
@@ -1676,15 +1677,23 @@ static int mxt_load_fw(struct device *dev, const char *fn) 
	mxt_free_object_table(data);

	reinit_completion(&data->bl_completion);



	ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD);

	ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD, false);

	if (ret) {

		/* Bootloader may still be unlocked from previous attempt */

		ret = mxt_check_bootloader(data, MXT_WAITING_FRAME_DATA, false);

		if (ret)

			goto disable_irq;

	} else {

		dev_info(dev, "Unlocking bootloader\n");



		/* Unlock bootloader */

	mxt_unlock_bootloader(data);

		ret = mxt_unlock_bootloader(data);

		if (ret)

			goto disable_irq;

	}



	while (pos < fw->size) {

		ret = mxt_check_bootloader(data, MXT_WAITING_FRAME_DATA);

		ret = mxt_check_bootloader(data, MXT_WAITING_FRAME_DATA, true);

		if (ret)

			goto disable_irq;
@@ -1698,7 +1707,7 @@ static int mxt_load_fw(struct device *dev, const char *fn) 
		if (ret)

			goto disable_irq;



		ret = mxt_check_bootloader(data, MXT_FRAME_CRC_PASS);

		ret = mxt_check_bootloader(data, MXT_FRAME_CRC_PASS, true);

		if (ret) {

			retry++;