diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 09:02:54 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 09:02:54 +0100 |
| commit | 5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1 (patch) | |
| tree | c5aa57e70d901ae05b25e61387a351e6b0b2826b /drivers/input/touchscreen | |
| parent | Input: stmpe-ts - add DT support for stmpe touchscreen (diff) | |
| parent | ARM - OMAP: ads7846: fix pendown debounce setting (diff) | |
| download | linux-5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1.tar.xz linux-5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1.zip | |
Merge branch 'for-linus' into next
Bring in changes to ads7846 to avoid mereg conflicts.
Diffstat (limited to 'drivers/input/touchscreen')
| -rw-r--r-- | drivers/input/touchscreen/ads7846.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index f02028ec3db6..78e5d9ab0ba7 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -955,7 +955,8 @@ static int ads7846_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume); -static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads7846 *ts) +static int __devinit ads7846_setup_pendown(struct spi_device *spi, + struct ads7846 *ts) { struct ads7846_platform_data *pdata = spi->dev.platform_data; int err; @@ -981,6 +982,9 @@ static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads784 ts->gpio_pendown = pdata->gpio_pendown; + if (pdata->gpio_pendown_debounce) + gpio_set_debounce(pdata->gpio_pendown, + pdata->gpio_pendown_debounce); } else { dev_err(&spi->dev, "no get_pendown_state nor gpio_pendown?\n"); return -EINVAL; |