Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9b557585ba8f9afa9ab5ca95415467635ec5e76d

Authored by Dan Murphy
2 parents 83f0643caa 185a8852eb
Exists in ti-linux-3.12.y and in 3 other branches newt-ti-linux-3.12.y, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y

Merge branch 'connectivity-ti-linux-3.12.y' of git://git.ti.com/connectivity-int… 

…egration-tree/connectivity-ti-linux-kernel into ti-linux-3.12.y

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.12.y

* 'connectivity-ti-linux-3.12.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  input: touchscreen: ti_am335x_tsc: Flush interrupts before suspend

Signed-off-by: Dan Murphy <DMurphy@ti.com>

Showing 1 changed file Side-by-side Diff

drivers/input/touchscreen/ti_am335x_tsc.c
Diff comments   View file @ 9b55758
... ... @@ -465,6 +465,9 @@
465 465  
466 466 tscadc_dev = ti_tscadc_dev_get(to_platform_device(dev));
467 467 if (device_may_wakeup(tscadc_dev->dev)) {
  468 + /* Flush any pending interrupts */
  469 + titsc_writel(ts_dev, REG_IRQSTATUS, 0xffffffff);
  470 +
468 471 idle = titsc_readl(ts_dev, REG_IRQENABLE);
469 472 titsc_writel(ts_dev, REG_IRQENABLE,
470 473 (idle | IRQENB_HW_PEN));