lkml.org 
[lkml]   [2013]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/15] input: ti_tsc: Enable shared IRQ for TSC
    Date
    From: "Patil, Rachna" <rachna@ti.com>

    Touchscreen and ADC share the same IRQ line from parent MFD core.
    Previously only Touchscreen was interrupt based.
    With continuous mode support added in ADC driver, driver requires
    interrupt to process the ADC samples, so enable shared IRQ flag bit for
    touchscreen.

    Signed-off-by: Patil, Rachna <rachna@ti.com>
    Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Signed-off-by: Zubair Lutfullah <zubair.lutfullah@gmail.com>
    ---
    drivers/input/touchscreen/ti_am335x_tsc.c | 14 +++++++++++---
    1 file changed, 11 insertions(+), 3 deletions(-)

    diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
    index 0e9f02a..edc3d03 100644
    --- a/drivers/input/touchscreen/ti_am335x_tsc.c
    +++ b/drivers/input/touchscreen/ti_am335x_tsc.c
    @@ -260,8 +260,16 @@ static irqreturn_t titsc_irq(int irq, void *dev)
    unsigned int fsm;

    status = titsc_readl(ts_dev, REG_IRQSTATUS);
    - if (status & IRQENB_FIFO0THRES) {

    + /*
    + * ADC and touchscreen share the IRQ line.
    + * FIFO1 threshold interrupt is used by ADC,
    + * hence return from touchscreen IRQ handler if FIFO1
    + * threshold interrupt occurred.
    + */
    + if (status & IRQENB_FIFO1THRES)
    + return IRQ_NONE;
    + else if (status & IRQENB_FIFO0THRES) {
    titsc_read_coordinates(ts_dev, &x, &y, &z1, &z2);

    if (ts_dev->pen_down && z1 != 0 && z2 != 0) {
    @@ -315,7 +323,7 @@ static irqreturn_t titsc_irq(int irq, void *dev)
    }

    if (irqclr) {
    - titsc_writel(ts_dev, REG_IRQSTATUS, irqclr);
    + titsc_writel(ts_dev, REG_IRQSTATUS, (status | irqclr));
    am335x_tsc_se_update(ts_dev->mfd_tscadc);
    return IRQ_HANDLED;
    }
    @@ -389,7 +397,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;
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-07-19 01:21    [W:4.186 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site