Re: [PATCH 03/15] input: ti_tsc: Enable shared IRQ for TSC

Re: [PATCH 03/15] input: ti_tsc: Enable shared IRQ for TSC

[Jonathan Cameron]

On 07/20/2013 11:57 AM, Jonathan Cameron wrote:
> On 07/18/2013 11:21 PM, Zubair Lutfullah wrote:
>> 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>
> cc'd Dmitry and Linux-input.
> 
> If this goes through IIO as it is required for the rest of the series to
> work then I will need an Ack from Dmitry.
Sorry, finger memory meant I cc'd linux-iio again, instead of linux-input.

> 
>> ---
>>  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;
>>