[PATCH 2/2] CHROMIUM: elants_i2c.c: Disable idle mode before firmware upgrade procedure.

[PATCH 2/2] CHROMIUM: elants_i2c.c: Disable idle mode before firmware upgrade procedure.

[james.chen]

From: "james.chen" <james.chen@emc.com.tw>

This patch is disable idle mode before firmware upgrade procedure.

BUG=chrome-os-partner:39373
TEST= Test Elan touchscreen on cyan project(kernel 3.18) without problems.

Signed-off-by: james.chen <james.chen@emc.com.tw>
---
 drivers/input/touchscreen/elants_i2c.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index 0efd766..6d3570e 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -605,6 +605,7 @@ static int elants_i2c_do_update_firmware(struct i2c_client *client,
 	const u8 enter_iap[] = { 0x45, 0x49, 0x41, 0x50 };
 	const u8 enter_iap2[] = { 0x54, 0x00, 0x12, 0x34 };
 	const u8 iap_ack[] = { 0x55, 0xaa, 0x33, 0xcc };
+	const u8 close_idle[] = {0x54, 0x2c, 0x01, 0x01};
 	u8 buf[HEADER_SIZE];
 	u16 send_id;
 	int page, n_fw_pages;
@@ -617,8 +618,13 @@ static int elants_i2c_do_update_firmware(struct i2c_client *client,
 	} else {
 		/* Start IAP Procedure */
 		dev_dbg(&client->dev, "Normal IAP procedure\n");
+		/* Close idle mode */
+		error = elants_i2c_send(client, close_idle, sizeof(close_idle));
+		if (error)
+			dev_err(&client->dev, "Failed close idle: %d\n", error);
+		msleep(60);
 		elants_i2c_sw_reset(client);
-
+		msleep(20);
 		error = elants_i2c_send(client, enter_iap, sizeof(enter_iap));
 	}
 
-- 
1.8.3.2

Re: [PATCH 2/2] CHROMIUM: elants_i2c.c: Disable idle mode before firmware upgrade procedure.

[Dmitry Torokhov]

Hi James,

On Tue, Jul 21, 2015 at 10:10:25AM +0800, james.chen wrote:
> From: "james.chen" <james.chen@emc.com.tw>
> 
> This patch is disable idle mode before firmware upgrade procedure.
> 
> BUG=chrome-os-partner:39373
> TEST= Test Elan touchscreen on cyan project(kernel 3.18) without problems.
> 
> Signed-off-by: james.chen <james.chen@emc.com.tw>
> ---
>  drivers/input/touchscreen/elants_i2c.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
> index 0efd766..6d3570e 100644
> --- a/drivers/input/touchscreen/elants_i2c.c
> +++ b/drivers/input/touchscreen/elants_i2c.c
> @@ -605,6 +605,7 @@ static int elants_i2c_do_update_firmware(struct i2c_client *client,
>  	const u8 enter_iap[] = { 0x45, 0x49, 0x41, 0x50 };
>  	const u8 enter_iap2[] = { 0x54, 0x00, 0x12, 0x34 };
>  	const u8 iap_ack[] = { 0x55, 0xaa, 0x33, 0xcc };
> +	const u8 close_idle[] = {0x54, 0x2c, 0x01, 0x01};
>  	u8 buf[HEADER_SIZE];
>  	u16 send_id;
>  	int page, n_fw_pages;
> @@ -617,8 +618,13 @@ static int elants_i2c_do_update_firmware(struct i2c_client *client,
>  	} else {
>  		/* Start IAP Procedure */
>  		dev_dbg(&client->dev, "Normal IAP procedure\n");
> +		/* Close idle mode */
> +		error = elants_i2c_send(client, close_idle, sizeof(close_idle));
> +		if (error)
> +			dev_err(&client->dev, "Failed close idle: %d\n", error);
> +		msleep(60);
>  		elants_i2c_sw_reset(client);
> -
> +		msleep(20);

Are you sure that this delay is also needed? We have the following in
elants_i2c_sw_reset():

	/*
	 * We should wait at least 10 msec (but no more than 40) before
	 * sending fastboot or IAP command to the device.
	 */
	msleep(30);

so additional 20 msec will push us out of the 40 msec window...

>  		error = elants_i2c_send(client, enter_iap, sizeof(enter_iap));
>  	}
>  
> -- 
> 1.8.3.2
> 

Thanks.

-- 
Dmitry

RE: [PATCH 2/2] CHROMIUM: elants_i2c.c: Disable idle mode before firmware upgrade procedure.

[James Chen]

Dear Dmitry:

We need to correct the value of sending fastboot or IAP command is 100msec
not 40 msec.
The firmware of all of volume-productions are used 100msec instead of
40msec.

And I will correct the comment.

James

-----Original Message-----
From: linux-input-owner@vger.kernel.org
[mailto:linux-input-owner@vger.kernel.org] On Behalf Of Dmitry Torokhov
Sent: Friday, July 24, 2015 6:17 AM
To: james.chen
Cc: Herman Lin; linux-input@vger.kernel.org; charliemooney@chromium.org
Subject: Re: [PATCH 2/2] CHROMIUM: elants_i2c.c: Disable idle mode before
firmware upgrade procedure.

Hi James,

On Tue, Jul 21, 2015 at 10:10:25AM +0800, james.chen wrote:
> From: "james.chen" <james.chen@emc.com.tw>
> 
> This patch is disable idle mode before firmware upgrade procedure.
> 
> BUG=chrome-os-partner:39373
> TEST= Test Elan touchscreen on cyan project(kernel 3.18) without problems.
> 
> Signed-off-by: james.chen <james.chen@emc.com.tw>
> ---
>  drivers/input/touchscreen/elants_i2c.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/input/touchscreen/elants_i2c.c
b/drivers/input/touchscreen/elants_i2c.c
> index 0efd766..6d3570e 100644
> --- a/drivers/input/touchscreen/elants_i2c.c
> +++ b/drivers/input/touchscreen/elants_i2c.c
> @@ -605,6 +605,7 @@ static int elants_i2c_do_update_firmware(struct
i2c_client *client,
>  	const u8 enter_iap[] = { 0x45, 0x49, 0x41, 0x50 };
>  	const u8 enter_iap2[] = { 0x54, 0x00, 0x12, 0x34 };
>  	const u8 iap_ack[] = { 0x55, 0xaa, 0x33, 0xcc };
> +	const u8 close_idle[] = {0x54, 0x2c, 0x01, 0x01};
>  	u8 buf[HEADER_SIZE];
>  	u16 send_id;
>  	int page, n_fw_pages;
> @@ -617,8 +618,13 @@ static int elants_i2c_do_update_firmware(struct
i2c_client *client,
>  	} else {
>  		/* Start IAP Procedure */
>  		dev_dbg(&client->dev, "Normal IAP procedure\n");
> +		/* Close idle mode */
> +		error = elants_i2c_send(client, close_idle,
sizeof(close_idle));
> +		if (error)
> +			dev_err(&client->dev, "Failed close idle: %d\n",
error);
> +		msleep(60);
>  		elants_i2c_sw_reset(client);
> -
> +		msleep(20);

Are you sure that this delay is also needed? We have the following in
elants_i2c_sw_reset():

	/*
	 * We should wait at least 10 msec (but no more than 40) before
	 * sending fastboot or IAP command to the device.
	 */
	msleep(30);

so additional 20 msec will push us out of the 40 msec window...

>  		error = elants_i2c_send(client, enter_iap,
sizeof(enter_iap));
>  	}
>  
> -- 
> 1.8.3.2
> 

Thanks.

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] CHROMIUM: elants_i2c.c: Disable idle mode before firmware upgrade procedure.

['Dmitry Torokhov']

Hi James,

On Tue, Jul 28, 2015 at 10:42:22AM +0800, James Chen wrote:
> Dear Dmitry:
> 
> We need to correct the value of sending fastboot or IAP command is 100msec
> not 40 msec.
> The firmware of all of volume-productions are used 100msec instead of
> 40msec.
> 
> And I will correct the comment.

OK, great. In the meantime I applied this patch.

Thanks.

> 
> James
> 
> -----Original Message-----
> From: linux-input-owner@vger.kernel.org
> [mailto:linux-input-owner@vger.kernel.org] On Behalf Of Dmitry Torokhov
> Sent: Friday, July 24, 2015 6:17 AM
> To: james.chen
> Cc: Herman Lin; linux-input@vger.kernel.org; charliemooney@chromium.org
> Subject: Re: [PATCH 2/2] CHROMIUM: elants_i2c.c: Disable idle mode before
> firmware upgrade procedure.
> 
> Hi James,
> 
> On Tue, Jul 21, 2015 at 10:10:25AM +0800, james.chen wrote:
> > From: "james.chen" <james.chen@emc.com.tw>
> > 
> > This patch is disable idle mode before firmware upgrade procedure.
> > 
> > BUG=chrome-os-partner:39373
> > TEST= Test Elan touchscreen on cyan project(kernel 3.18) without problems.
> > 
> > Signed-off-by: james.chen <james.chen@emc.com.tw>
> > ---
> >  drivers/input/touchscreen/elants_i2c.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/input/touchscreen/elants_i2c.c
> b/drivers/input/touchscreen/elants_i2c.c
> > index 0efd766..6d3570e 100644
> > --- a/drivers/input/touchscreen/elants_i2c.c
> > +++ b/drivers/input/touchscreen/elants_i2c.c
> > @@ -605,6 +605,7 @@ static int elants_i2c_do_update_firmware(struct
> i2c_client *client,
> >  	const u8 enter_iap[] = { 0x45, 0x49, 0x41, 0x50 };
> >  	const u8 enter_iap2[] = { 0x54, 0x00, 0x12, 0x34 };
> >  	const u8 iap_ack[] = { 0x55, 0xaa, 0x33, 0xcc };
> > +	const u8 close_idle[] = {0x54, 0x2c, 0x01, 0x01};
> >  	u8 buf[HEADER_SIZE];
> >  	u16 send_id;
> >  	int page, n_fw_pages;
> > @@ -617,8 +618,13 @@ static int elants_i2c_do_update_firmware(struct
> i2c_client *client,
> >  	} else {
> >  		/* Start IAP Procedure */
> >  		dev_dbg(&client->dev, "Normal IAP procedure\n");
> > +		/* Close idle mode */
> > +		error = elants_i2c_send(client, close_idle,
> sizeof(close_idle));
> > +		if (error)
> > +			dev_err(&client->dev, "Failed close idle: %d\n",
> error);
> > +		msleep(60);
> >  		elants_i2c_sw_reset(client);
> > -
> > +		msleep(20);
> 
> Are you sure that this delay is also needed? We have the following in
> elants_i2c_sw_reset():
> 
> 	/*
> 	 * We should wait at least 10 msec (but no more than 40) before
> 	 * sending fastboot or IAP command to the device.
> 	 */
> 	msleep(30);
> 
> so additional 20 msec will push us out of the 40 msec window...
> 
> >  		error = elants_i2c_send(client, enter_iap,
> sizeof(enter_iap));
> >  	}
> >  
> > -- 
> > 1.8.3.2
> > 
> 
> Thanks.
> 
> -- 
> Dmitry
> --
> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 
Dmitry