| Message ID | 1377470724-15710-2-git-send-email-zubair.lutfullah@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Zubair Lutfullah | 2013-08-25 23:45:23 [+0100]: >diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c >index e1c5300..4124e580 100644 >--- a/drivers/input/touchscreen/ti_am335x_tsc.c >+++ b/drivers/input/touchscreen/ti_am335x_tsc.c >@@ -315,11 +321,17 @@ static irqreturn_t titsc_irq(int irq, void *dev) > } > > if (irqclr) { >- titsc_writel(ts_dev, REG_IRQSTATUS, irqclr); >- am335x_tsc_se_update(ts_dev->mfd_tscadc); >- return IRQ_HANDLED; >+ titsc_writel(ts_dev, REG_IRQSTATUS, (status | irqclr)); >+ am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask); > } >- return IRQ_NONE; >+ >+ /* If any IRQ flags left, return none. So ADC can handle its IRQs */ >+ status = titsc_readl(ts_dev, REG_IRQSTATUS); >+ if (status == false) >+ return IRQ_HANDLED; >+ else >+ return IRQ_NONE; If I understand this correctly you return IRQ_NONE the TSC interrupt has been handled and no ADC interrupt is outstanding. This is bad because if you received 1k _only_ TSC interrupts you return always IRQ_NONE and the irq-core will disable the interrupt line. You don't want this. Now, if you handle an interrupt at the TSC level and return IRQ_HANDLED then the second handler, the ADC in your case, is also invoked. So you can drop this and return IRQ_HANDLED if you *did* something here and NONE if didn't do anything. Basides that, I'm fine with it. >+ > } Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Aug 28, 2013 at 12:42:11PM +0200, Sebastian Andrzej Siewior wrote: > * Zubair Lutfullah | 2013-08-25 23:45:23 [+0100]: > > >diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c > >index e1c5300..4124e580 100644 > >--- a/drivers/input/touchscreen/ti_am335x_tsc.c > >+++ b/drivers/input/touchscreen/ti_am335x_tsc.c > >@@ -315,11 +321,17 @@ static irqreturn_t titsc_irq(int irq, void *dev) ... > >+ /* If any IRQ flags left, return none. So ADC can handle its IRQs */ > >+ status = titsc_readl(ts_dev, REG_IRQSTATUS); > >+ if (status == false) > >+ return IRQ_HANDLED; > >+ else > >+ return IRQ_NONE; > > If I understand this correctly you return IRQ_NONE the TSC interrupt has > been handled and no ADC interrupt is outstanding. Its actually the opposite. TSC handler checks if there are any ADC IRQ flags outstanding. If there is no outstanding, then IRQ_HANDLED is returned. If there is ADC IRQ outstanding, then IRQ_NONE is returned. ZubairLK -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index e1c5300..4124e580 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c @@ -52,6 +52,7 @@ struct titsc { u32 config_inp[4]; u32 bit_xp, bit_xn, bit_yp, bit_yn; u32 inp_xp, inp_xn, inp_yp, inp_yn; + u32 step_mask; }; static unsigned int titsc_readl(struct titsc *ts, unsigned int reg) @@ -196,7 +197,8 @@ static void titsc_step_config(struct titsc *ts_dev) /* The steps1 … end and bit 0 for TS_Charge */ 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, @@ -260,6 +262,10 @@ static irqreturn_t titsc_irq(int irq, void *dev) unsigned int fsm; 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) { titsc_read_coordinates(ts_dev, &x, &y, &z1, &z2); @@ -315,11 +321,17 @@ static irqreturn_t titsc_irq(int irq, void *dev) } if (irqclr) { - titsc_writel(ts_dev, REG_IRQSTATUS, irqclr); - am335x_tsc_se_update(ts_dev->mfd_tscadc); - return IRQ_HANDLED; + titsc_writel(ts_dev, REG_IRQSTATUS, (status | irqclr)); + am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask); } - return IRQ_NONE; + + /* If any IRQ flags left, return none. So ADC can handle its IRQs */ + status = titsc_readl(ts_dev, REG_IRQSTATUS); + if (status == false) + return IRQ_HANDLED; + else + return IRQ_NONE; + } static int titsc_parse_dt(struct platform_device *pdev, @@ -389,7 +401,7 @@ static int titsc_probe(struct platform_device *pdev) } 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) { dev_err(&pdev->dev, "failed to allocate irq.\n"); goto err_free_mem;
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: Zubair Lutfullah <zubair.lutfullah@gmail.com> --- drivers/input/touchscreen/ti_am335x_tsc.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)