diff options
| author | Sundar R Iyer <sundar.iyer@stericsson.com> | 2010-03-04 23:50:12 +0530 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:44:20 -0600 |
| commit | d9c1ab1ad294e1da09762d04e2c61a9f19676e16 (patch) | |
| tree | 1ea5e64587431f4fe4816bd3ccbcb77bd54959d7 /drivers/input | |
| parent | b48eef9f7fa27a7e127e8ac86cc1d3a07106cb17 (diff) | |
u8500-tsc : fix stm_gpio_altfuncenable wrong requests for gpio 228 during a resume
Signed-off-by: Sundar R Iyer <sundar.iyer@stericsson.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/u8500_tsc.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/u8500_tsc.c b/drivers/input/touchscreen/u8500_tsc.c index e5b716e7f0c..91f70dc852d 100644 --- a/drivers/input/touchscreen/u8500_tsc.c +++ b/drivers/input/touchscreen/u8500_tsc.c @@ -985,12 +985,7 @@ err: static tsc_error tsc_config(struct u8500_tsc_data *pdev_data) { int retval; - retval = pdev_data->chip->cs_en(); - if (retval != TSC_OK) { - dev_err(&pdev_data->client->dev, - "error in init the tsc platform initialization\n"); - goto err; - } + retval = bu21013_tsc_init(pdev_data->client); if (retval == TSC_OK) { init_config(pdev_data); @@ -1128,6 +1123,14 @@ static int tp_probe(struct i2c_client *i2c, const struct i2c_device_id *id) i2c_set_clientdata(i2c, tsc_data); init_waitqueue_head(&tsc_data->touchp_event); + /* configure the gpio pins */ + retval = tsc_data->chip->cs_en(); + if (retval != TSC_OK) { + dev_err(&tsc_data->client->dev, + "error in init the tsc platform initialization\n"); + goto err; + } + /** configure the touch panel controller */ retval = tsc_config(tsc_data); if (retval < 0) { |