diff options
| author | Anatolij Gustschin <agust@denx.de> | 2010-06-28 01:25:19 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-28 01:34:25 -0700 |
| commit | 7804302b14032d357d889e4a23e463eb6a6c5136 (patch) | |
| tree | c71800f52507e70691786347c96168724dcf6ea4 | |
| parent | c8f2edc56acf0a55ede777c07314c9744bb723be (diff) | |
| download | op-kernel-dev-7804302b14032d357d889e4a23e463eb6a6c5136.zip op-kernel-dev-7804302b14032d357d889e4a23e463eb6a6c5136.tar.gz | |
Input: ads7846 - allow specifying irq trigger type in platform data
On some platforms, for example with GPIO interrupts on mpc5121,
it is not possible to configure falling edge interrupts.
Specifying irq trigger type in platform data structure
allows using ads7846 driver on such platforms.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| -rw-r--r-- | drivers/input/touchscreen/ads7846.c | 5 | ||||
| -rw-r--r-- | include/linux/spi/ads7846.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index a9fdf55..69210cb5 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -1174,7 +1174,10 @@ static int __devinit ads7846_probe(struct spi_device *spi) goto err_put_regulator; } - if (request_irq(spi->irq, ads7846_irq, IRQF_TRIGGER_FALLING, + if (!pdata->irq_flags) + pdata->irq_flags = IRQF_TRIGGER_FALLING; + + if (request_irq(spi->irq, ads7846_irq, pdata->irq_flags, spi->dev.driver->name, ts)) { dev_info(&spi->dev, "trying pin change workaround on irq %d\n", spi->irq); diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h index b4ae570..95d36bf 100644 --- a/include/linux/spi/ads7846.h +++ b/include/linux/spi/ads7846.h @@ -54,5 +54,6 @@ struct ads7846_platform_data { void (*filter_cleanup)(void *filter_data); void (*wait_for_sync)(void); bool wakeup; + unsigned long irq_flags; }; |
