From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760319AbcHYQmO (ORCPT ); Thu, 25 Aug 2016 12:42:14 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:33830 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755812AbcHYQlI (ORCPT ); Thu, 25 Aug 2016 12:41:08 -0400 Date: Thu, 25 Aug 2016 09:40:46 -0700 From: Dmitry Torokhov To: Johnny Chuang Cc: Daniel Kurtz , Jennifer Tsai , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, James Chen , Paul Liang , Jeff Chuang Subject: Re: [PATCH] Input: elants_i2c - get product id on recovery mode for FW update Message-ID: <20160825164046.GB11206@dtor-ws> References: <1472028265-5018-1-git-send-email-johnny.chuang@emc.com.tw> <1472119916-7641-1-git-send-email-johnny.chuang@emc.com.tw> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1472119916-7641-1-git-send-email-johnny.chuang@emc.com.tw> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 25, 2016 at 06:11:56PM +0800, Johnny Chuang wrote: > This CL takes the responsibility for getting product/hardware id > on recovery mode. > It will fix firmware update script could not find correspond firmware > file name on recovery mode. > BTW, firmware must need to support reading product/hardware id > on boot code. > > Signed-off-by: Johnny Chuang Applied, thank you. > --- > drivers/input/touchscreen/elants_i2c.c | 30 +++++++++++++++++++----------- > 1 file changed, 19 insertions(+), 11 deletions(-) > > diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c > index ac09855..dc9f608 100644 > --- a/drivers/input/touchscreen/elants_i2c.c > +++ b/drivers/input/touchscreen/elants_i2c.c > @@ -298,7 +298,7 @@ static u16 elants_i2c_parse_version(u8 *buf) > return get_unaligned_be32(buf) >> 4; > } > > -static int elants_i2c_query_fw_id(struct elants_data *ts) > +static int elants_i2c_query_hw_version(struct elants_data *ts) > { > struct i2c_client *client = ts->client; > int error, retry_cnt; > @@ -318,8 +318,13 @@ static int elants_i2c_query_fw_id(struct elants_data *ts) > error, (int)sizeof(resp), resp); > } > > - dev_err(&client->dev, > - "Failed to read fw id or fw id is invalid\n"); > + if (error) { > + dev_err(&client->dev, > + "Failed to read fw id: %d\n", error); > + return error; > + } > + > + dev_err(&client->dev, "Invalid fw id: %#04x\n", ts->hw_version); > > return -EINVAL; > } > @@ -508,7 +513,7 @@ static int elants_i2c_fastboot(struct i2c_client *client) > static int elants_i2c_initialize(struct elants_data *ts) > { > struct i2c_client *client = ts->client; > - int error, retry_cnt; > + int error, error2, retry_cnt; > const u8 hello_packet[] = { 0x55, 0x55, 0x55, 0x55 }; > const u8 recov_packet[] = { 0x55, 0x55, 0x80, 0x80 }; > u8 buf[HEADER_SIZE]; > @@ -553,18 +558,21 @@ static int elants_i2c_initialize(struct elants_data *ts) > } > } > > + /* hw version is available even if device in recovery state */ > + error2 = elants_i2c_query_hw_version(ts); > if (!error) > - error = elants_i2c_query_fw_id(ts); > + error = error2; > if (!error) > error = elants_i2c_query_fw_version(ts); > + if (!error) > + error = elants_i2c_query_test_version(ts); > + if (!error) > + error = elants_i2c_query_bc_version(ts); > + if (!error) > + error = elants_i2c_query_ts_info(ts); > > - if (error) { > + if (error) > ts->iap_mode = ELAN_IAP_RECOVERY; > - } else { > - elants_i2c_query_test_version(ts); > - elants_i2c_query_bc_version(ts); > - elants_i2c_query_ts_info(ts); > - } > > return 0; > } > -- > 1.8.3.2 > -- Dmitry