diff options
author | Vignesh R <vigneshr@ti.com> | 2018-06-30 06:33:18 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2018-10-09 06:28:31 -0400 |
commit | 7a39915b723ae46e78c5189dfb3fc889df976a8d (patch) | |
tree | e50f34bdb043f859540d2ef179dd1bc0348d9fe5 | |
parent | 9eea8326f4e6862637b94f09deb2ec9f2b50e1bc (diff) |
Input: ti_am335x_tsc: Mark IRQ as wakeup capable
On AM335x, ti_am335x_tsc can wake up the system from suspend, mark the
IRQ as wakeup capable, so that device irq is not disabled during system
suspend.
Signed-off-by: Vignesh R <vigneshr@ti.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | drivers/input/touchscreen/ti_am335x_tsc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index a4f25a915ffc..9e8684ab48f4 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/of.h> | 27 | #include <linux/of.h> |
28 | #include <linux/of_device.h> | 28 | #include <linux/of_device.h> |
29 | #include <linux/sort.h> | 29 | #include <linux/sort.h> |
30 | #include <linux/pm_wakeirq.h> | ||
30 | 31 | ||
31 | #include <linux/mfd/ti_am335x_tscadc.h> | 32 | #include <linux/mfd/ti_am335x_tscadc.h> |
32 | 33 | ||
@@ -439,6 +440,9 @@ static int titsc_probe(struct platform_device *pdev) | |||
439 | } | 440 | } |
440 | 441 | ||
441 | device_init_wakeup(&pdev->dev, true); | 442 | device_init_wakeup(&pdev->dev, true); |
443 | err = dev_pm_set_wake_irq(&pdev->dev, ts_dev->irq); | ||
444 | if (err) | ||
445 | dev_err(&pdev->dev, "irq wake enable failed.\n"); | ||
442 | 446 | ||
443 | titsc_writel(ts_dev, REG_IRQSTATUS, TSC_IRQENB_MASK); | 447 | titsc_writel(ts_dev, REG_IRQSTATUS, TSC_IRQENB_MASK); |
444 | titsc_writel(ts_dev, REG_IRQENABLE, IRQENB_FIFO0THRES); | 448 | titsc_writel(ts_dev, REG_IRQENABLE, IRQENB_FIFO0THRES); |
@@ -471,6 +475,7 @@ static int titsc_probe(struct platform_device *pdev) | |||
471 | return 0; | 475 | return 0; |
472 | 476 | ||
473 | err_free_irq: | 477 | err_free_irq: |
478 | dev_pm_clear_wake_irq(&pdev->dev); | ||
474 | device_init_wakeup(&pdev->dev, false); | 479 | device_init_wakeup(&pdev->dev, false); |
475 | free_irq(ts_dev->irq, ts_dev); | 480 | free_irq(ts_dev->irq, ts_dev); |
476 | err_free_mem: | 481 | err_free_mem: |
@@ -484,6 +489,7 @@ static int titsc_remove(struct platform_device *pdev) | |||
484 | struct titsc *ts_dev = platform_get_drvdata(pdev); | 489 | struct titsc *ts_dev = platform_get_drvdata(pdev); |
485 | u32 steps; | 490 | u32 steps; |
486 | 491 | ||
492 | dev_pm_clear_wake_irq(&pdev->dev); | ||
487 | device_init_wakeup(&pdev->dev, false); | 493 | device_init_wakeup(&pdev->dev, false); |
488 | free_irq(ts_dev->irq, ts_dev); | 494 | free_irq(ts_dev->irq, ts_dev); |
489 | 495 | ||