diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-14 13:38:16 +0000 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 10:41:43 +0100 |
| commit | df508450870cd5b4478156dcde8e68e6bf0d6661 (patch) | |
| tree | 496b4bb0f26e207764ae7fefcddd57778082ddf6 /drivers/mfd/wm831x-irq.c | |
| parent | 6447f55da90b77faec1697d499ed7986bb4f6de6 (diff) | |
| download | linux-df508450870cd5b4478156dcde8e68e6bf0d6661.tar.bz2 | |
mfd: Leave acknowledgement of WM831x touchscreen IRQs to the driver
The WM831x touchscreen interrupts need acknowledgement even when using
direct signals to the CPU (which don't go through the core) so leave
the acknowledgement up to the touchscreen driver for simplicity.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/wm831x-irq.c')
| -rw-r--r-- | drivers/mfd/wm831x-irq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c index f7192d438aab..2691648e607e 100644 --- a/drivers/mfd/wm831x-irq.c +++ b/drivers/mfd/wm831x-irq.c @@ -481,6 +481,9 @@ static irqreturn_t wm831x_irq_thread(int irq, void *data) } out: + /* Touchscreen interrupts are handled specially in the driver */ + status_regs[0] &= ~(WM831X_TCHDATA_EINT | WM831X_TCHPD_EINT); + for (i = 0; i < ARRAY_SIZE(status_regs); i++) { if (status_regs[i]) wm831x_reg_write(wm831x, WM831X_INTERRUPT_STATUS_1 + i, |