| Message ID | 4D9F0AA2.3010501@atmel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 08960a070add74cda8c968b8ace5418a5acf17c3 |
| Headers | show |
2011/4/8 Iiro Valkonen <iiro.valkonen@atmel.com>: > Make the CHG line (interrupt line) go high after the interrupts have been enabled to make sure > we don't miss the falling edge. > > Signed-off-by: Iiro Valkonen <iiro.valkonen@atmel.com> > --- > v3: Change the locations where this is done to ensure correct operation at FW update, > and to get rid of some error handling > > drivers/input/touchscreen/atmel_mxt_ts.c | 12 ++++++++---- > 1 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c > index 4012436..5f09f57 100644 > --- a/drivers/input/touchscreen/atmel_mxt_ts.c > +++ b/drivers/input/touchscreen/atmel_mxt_ts.c > @@ -804,10 +804,6 @@ static int mxt_initialize(struct mxt_data *data) > if (error) > return error; > > - error = mxt_make_highchg(data); > - if (error) > - return error; > - > mxt_handle_pdata(data); > > /* Backup to memory */ > @@ -981,6 +977,10 @@ static ssize_t mxt_update_fw_store(struct device *dev, > > enable_irq(data->irq); > > + error = mxt_make_highchg(data); > + if (error) > + return error; > + > return count; > } > > @@ -1090,6 +1090,10 @@ static int __devinit mxt_probe(struct i2c_client *client, > goto err_free_object; > } > > + error = mxt_make_highchg(data); > + if (error) > + goto err_free_irq; > + > error = input_register_device(input_dev); > if (error) > goto err_free_irq; > -- > 1.7.0.4 > > Acked-by: Joonyoung Shim <jy0922.shim@samsung.com> Thanks.
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 4012436..5f09f57 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -804,10 +804,6 @@ static int mxt_initialize(struct mxt_data *data) if (error) return error; - error = mxt_make_highchg(data); - if (error) - return error; - mxt_handle_pdata(data); /* Backup to memory */ @@ -981,6 +977,10 @@ static ssize_t mxt_update_fw_store(struct device *dev, enable_irq(data->irq); + error = mxt_make_highchg(data); + if (error) + return error; + return count; } @@ -1090,6 +1090,10 @@ static int __devinit mxt_probe(struct i2c_client *client, goto err_free_object; } + error = mxt_make_highchg(data); + if (error) + goto err_free_irq; + error = input_register_device(input_dev); if (error) goto err_free_irq;
Make the CHG line (interrupt line) go high after the interrupts have been enabled to make sure we don't miss the falling edge. Signed-off-by: Iiro Valkonen <iiro.valkonen@atmel.com> --- v3: Change the locations where this is done to ensure correct operation at FW update, and to get rid of some error handling drivers/input/touchscreen/atmel_mxt_ts.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)