Commit baee5399 authored by Zubair Lutfullah's avatar Zubair Lutfullah Committed by Jonathan Cameron

input: ti_am335x_tsc: Enable shared IRQ for TSC

Enable shared IRQ to allow ADC to share IRQ line from
parent MFD core. Only FIFO0 IRQs are for TSC and handled
on the TSC side.

Step mask would be updated from cached variable only previously.
In rare cases when both TSC and ADC are used, the cached
variable gets mixed up.
The step mask is written with the required mask every time.

Rachna Patil (TI) laid ground work for shared IRQ.
Signed-off-by: default avatarZubair Lutfullah <zubair.lutfullah@gmail.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 42877236
...@@ -52,6 +52,7 @@ struct titsc { ...@@ -52,6 +52,7 @@ struct titsc {
u32 config_inp[4]; u32 config_inp[4];
u32 bit_xp, bit_xn, bit_yp, bit_yn; u32 bit_xp, bit_xn, bit_yp, bit_yn;
u32 inp_xp, inp_xn, inp_yp, inp_yn; u32 inp_xp, inp_xn, inp_yp, inp_yn;
u32 step_mask;
}; };
static unsigned int titsc_readl(struct titsc *ts, unsigned int reg) static unsigned int titsc_readl(struct titsc *ts, unsigned int reg)
...@@ -196,7 +197,8 @@ static void titsc_step_config(struct titsc *ts_dev) ...@@ -196,7 +197,8 @@ static void titsc_step_config(struct titsc *ts_dev)
/* The steps1 … end and bit 0 for TS_Charge */ /* The steps1 … end and bit 0 for TS_Charge */
stepenable = (1 << (end_step + 2)) - 1; stepenable = (1 << (end_step + 2)) - 1;
am335x_tsc_se_set(ts_dev->mfd_tscadc, stepenable); ts_dev->step_mask = stepenable;
am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask);
} }
static void titsc_read_coordinates(struct titsc *ts_dev, static void titsc_read_coordinates(struct titsc *ts_dev,
...@@ -260,6 +262,10 @@ static irqreturn_t titsc_irq(int irq, void *dev) ...@@ -260,6 +262,10 @@ static irqreturn_t titsc_irq(int irq, void *dev)
unsigned int fsm; unsigned int fsm;
status = titsc_readl(ts_dev, REG_IRQSTATUS); status = titsc_readl(ts_dev, REG_IRQSTATUS);
/*
* ADC and touchscreen share the IRQ line.
* FIFO1 interrupts are used by ADC. Handle FIFO0 IRQs here only
*/
if (status & IRQENB_FIFO0THRES) { if (status & IRQENB_FIFO0THRES) {
titsc_read_coordinates(ts_dev, &x, &y, &z1, &z2); titsc_read_coordinates(ts_dev, &x, &y, &z1, &z2);
...@@ -316,7 +322,7 @@ static irqreturn_t titsc_irq(int irq, void *dev) ...@@ -316,7 +322,7 @@ static irqreturn_t titsc_irq(int irq, void *dev)
if (irqclr) { if (irqclr) {
titsc_writel(ts_dev, REG_IRQSTATUS, irqclr); titsc_writel(ts_dev, REG_IRQSTATUS, irqclr);
am335x_tsc_se_update(ts_dev->mfd_tscadc); am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
return IRQ_NONE; return IRQ_NONE;
...@@ -389,7 +395,7 @@ static int titsc_probe(struct platform_device *pdev) ...@@ -389,7 +395,7 @@ static int titsc_probe(struct platform_device *pdev)
} }
err = request_irq(ts_dev->irq, titsc_irq, err = request_irq(ts_dev->irq, titsc_irq,
0, pdev->dev.driver->name, ts_dev); IRQF_SHARED, pdev->dev.driver->name, ts_dev);
if (err) { if (err) {
dev_err(&pdev->dev, "failed to allocate irq.\n"); dev_err(&pdev->dev, "failed to allocate irq.\n");
goto err_free_mem; goto err_free_mem;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment