Input: ti_am335x_tsc - ack pending IRQs at probe and before suspend
authorGrygorii Strashko <grygorii.strashko@ti.com>
Wed, 30 May 2018 21:23:15 +0000 (14:23 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 30 May 2018 23:42:12 +0000 (16:42 -0700)
It is seen that just enabling the TSC module triggers a HW_PEN IRQ
without any interaction with touchscreen by user. This results in first
suspend/resume sequence to fail as system immediately wakes up from
suspend as soon as HW_PEN IRQ is enabled in suspend handler due to the
pending IRQ. Therefore clear all IRQs at probe and also in suspend
callback for sanity.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Vignesh R <vigneshr@ti.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/ti_am335x_tsc.c

index f1043ae71dccb5c4a10126279ff0b1a3c6142089..a8c828de723cafa1ed9045eeb61b9a04b22083ab 100644 (file)
@@ -34,6 +34,8 @@
 #define SEQ_SETTLE             275
 #define MAX_12BIT              ((1 << 12) - 1)
 
+#define TSC_IRQENB_MASK                (IRQENB_FIFO0THRES | IRQENB_EOS | IRQENB_HW_PEN)
+
 static const int config_pins[] = {
        STEPCONFIG_XPP,
        STEPCONFIG_XNN,
@@ -432,6 +434,7 @@ static int titsc_probe(struct platform_device *pdev)
                goto err_free_mem;
        }
 
+       titsc_writel(ts_dev, REG_IRQSTATUS, TSC_IRQENB_MASK);
        titsc_writel(ts_dev, REG_IRQENABLE, IRQENB_FIFO0THRES);
        titsc_writel(ts_dev, REG_IRQENABLE, IRQENB_EOS);
        err = titsc_config_wires(ts_dev);
@@ -495,6 +498,7 @@ static int __maybe_unused titsc_suspend(struct device *dev)
 
        tscadc_dev = ti_tscadc_dev_get(to_platform_device(dev));
        if (device_may_wakeup(tscadc_dev->dev)) {
+               titsc_writel(ts_dev, REG_IRQSTATUS, TSC_IRQENB_MASK);
                idle = titsc_readl(ts_dev, REG_IRQENABLE);
                titsc_writel(ts_dev, REG_IRQENABLE,
                                (idle | IRQENB_HW_PEN));