aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-14 08:38:16 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 05:41:43 -0400
commitdf508450870cd5b4478156dcde8e68e6bf0d6661 (patch)
tree496b4bb0f26e207764ae7fefcddd57778082ddf6
parent6447f55da90b77faec1697d499ed7986bb4f6de6 (diff)
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>
-rw-r--r--drivers/mfd/wm831x-irq.c3
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)
481 } 481 }
482 482
483out: 483out:
484 /* Touchscreen interrupts are handled specially in the driver */
485 status_regs[0] &= ~(WM831X_TCHDATA_EINT | WM831X_TCHPD_EINT);
486
484 for (i = 0; i < ARRAY_SIZE(status_regs); i++) { 487 for (i = 0; i < ARRAY_SIZE(status_regs); i++) {
485 if (status_regs[i]) 488 if (status_regs[i])
486 wm831x_reg_write(wm831x, WM831X_INTERRUPT_STATUS_1 + i, 489 wm831x_reg_write(wm831x, WM831X_INTERRUPT_STATUS_1 + i,