UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Input: ti_am335x_tsc: Mark TSC device as wakeup source 

Instead of TSCADC MFD device, mark TSC as wakeup source and change all
wakeup related PM calls to operate on TSC device.

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>
This commit is contained in:
Vignesh R 2018-06-30 16:03:15 +05:30 committed by Lee Jones
parent cec945c293
commit 333e07ec4b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/input/touchscreen/ti_am335x_tsc.c
View File

@ -46,6 +46,7 @@ static const int config_pins[] = {
struct titsc { struct titsc {
struct input_dev *input; struct input_dev *input;
struct ti_tscadc_dev *mfd_tscadc; struct ti_tscadc_dev *mfd_tscadc;
struct device *dev;
unsigned int irq; unsigned int irq;
unsigned int wires; unsigned int wires;
unsigned int x_plate_resistance; unsigned int x_plate_resistance;
@ -276,7 +277,7 @@ static irqreturn_t titsc_irq(int irq, void *dev)
if (status & IRQENB_HW_PEN) { if (status & IRQENB_HW_PEN) {
ts_dev->pen_down = true; ts_dev->pen_down = true;
irqclr |= IRQENB_HW_PEN; irqclr |= IRQENB_HW_PEN;
pm_stay_awake(ts_dev->mfd_tscadc->dev); pm_stay_awake(ts_dev->dev);
} }
if (status & IRQENB_PENUP) { if (status & IRQENB_PENUP) {
@ -286,7 +287,7 @@ static irqreturn_t titsc_irq(int irq, void *dev)
input_report_key(input_dev, BTN_TOUCH, 0); input_report_key(input_dev, BTN_TOUCH, 0);
input_report_abs(input_dev, ABS_PRESSURE, 0); input_report_abs(input_dev, ABS_PRESSURE, 0);
input_sync(input_dev); input_sync(input_dev);
pm_relax(ts_dev->mfd_tscadc->dev); pm_relax(ts_dev->dev);
} else { } else {
ts_dev->pen_down = true; ts_dev->pen_down = true;
} }
@ -422,6 +423,7 @@ static int titsc_probe(struct platform_device *pdev)
ts_dev->mfd_tscadc = tscadc_dev; ts_dev->mfd_tscadc = tscadc_dev;
ts_dev->input = input_dev; ts_dev->input = input_dev;
ts_dev->irq = tscadc_dev->irq; ts_dev->irq = tscadc_dev->irq;
ts_dev->dev = &pdev->dev;
err = titsc_parse_dt(pdev, ts_dev); err = titsc_parse_dt(pdev, ts_dev);
if (err) { if (err) {
@ -436,6 +438,8 @@ static int titsc_probe(struct platform_device *pdev)
goto err_free_mem; goto err_free_mem;
} }
device_init_wakeup(&pdev->dev, true);
titsc_writel(ts_dev, REG_IRQSTATUS, TSC_IRQENB_MASK); titsc_writel(ts_dev, REG_IRQSTATUS, TSC_IRQENB_MASK);
titsc_writel(ts_dev, REG_IRQENABLE, IRQENB_FIFO0THRES); titsc_writel(ts_dev, REG_IRQENABLE, IRQENB_FIFO0THRES);
titsc_writel(ts_dev, REG_IRQENABLE, IRQENB_EOS); titsc_writel(ts_dev, REG_IRQENABLE, IRQENB_EOS);
@ -467,6 +471,7 @@ static int titsc_probe(struct platform_device *pdev)
return 0; return 0;
err_free_irq: err_free_irq:
device_init_wakeup(&pdev->dev, false);
free_irq(ts_dev->irq, ts_dev); free_irq(ts_dev->irq, ts_dev);
err_free_mem: err_free_mem:
input_free_device(input_dev); input_free_device(input_dev);
@ -479,6 +484,7 @@ static int titsc_remove(struct platform_device *pdev)
struct titsc *ts_dev = platform_get_drvdata(pdev); struct titsc *ts_dev = platform_get_drvdata(pdev);
u32 steps; u32 steps;
device_init_wakeup(&pdev->dev, false);
free_irq(ts_dev->irq, ts_dev); free_irq(ts_dev->irq, ts_dev);
/* total steps followed by the enable mask */ /* total steps followed by the enable mask */
@ -499,7 +505,7 @@ static int __maybe_unused titsc_suspend(struct device *dev)
unsigned int idle; unsigned int idle;
tscadc_dev = ti_tscadc_dev_get(to_platform_device(dev)); tscadc_dev = ti_tscadc_dev_get(to_platform_device(dev));
if (device_may_wakeup(tscadc_dev->dev)) { if (device_may_wakeup(dev)) {
titsc_writel(ts_dev, REG_IRQSTATUS, TSC_IRQENB_MASK); titsc_writel(ts_dev, REG_IRQSTATUS, TSC_IRQENB_MASK);
idle = titsc_readl(ts_dev, REG_IRQENABLE); idle = titsc_readl(ts_dev, REG_IRQENABLE);
titsc_writel(ts_dev, REG_IRQENABLE, titsc_writel(ts_dev, REG_IRQENABLE,
@ -515,11 +521,11 @@ static int __maybe_unused titsc_resume(struct device *dev)
struct ti_tscadc_dev *tscadc_dev; struct ti_tscadc_dev *tscadc_dev;
tscadc_dev = ti_tscadc_dev_get(to_platform_device(dev)); tscadc_dev = ti_tscadc_dev_get(to_platform_device(dev));
if (device_may_wakeup(tscadc_dev->dev)) { if (device_may_wakeup(dev)) {
titsc_writel(ts_dev, REG_IRQWAKEUP, titsc_writel(ts_dev, REG_IRQWAKEUP,
0x00); 0x00);
titsc_writel(ts_dev, REG_IRQCLR, IRQENB_HW_PEN); titsc_writel(ts_dev, REG_IRQCLR, IRQENB_HW_PEN);
pm_relax(ts_dev->mfd_tscadc->dev); pm_relax(dev);
} }
titsc_step_config(ts_dev); titsc_step_config(ts_dev);
titsc_writel(ts_dev, REG_FIFO0THR, titsc_writel(ts_dev, REG_FIFO0THR,