Re: [PATCH 2/2] iio: ti_am335x_adc: Take touchscreen channels into account for conversion timeout

[Jonathan Cameron <jic23@kernel.org>]

On 09/15/13 17:17, Jonathan Cameron wrote:
> On 09/10/13 22:02, Matthias Kaehlcke wrote:
>> The calculation of the old conversion timeout value was based on the number of
>> channels used by this driver. This doesn't take into account that other channels
>> can be used by the touchscreen driver. Adjust the timeout value to the maximum
>> if the touchscreen driver is enabled
>>
>> Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
> Hmm... This is a bit of an uggly solution.  Can we do anything neater via some
> callbacks in the underlying mfd?  Rachna, any thoughts on this?
Ah, Rachna's email is dead.  So, anyone else care to comment?
> 
> If not I'm happy to take this as fixing a real problem and we can tidy up later
> if needed.
> 
> Jonathan
>> ---
>>  drivers/iio/adc/ti_am335x_adc.c | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
>> index 3ceac3e..898fc78 100644
>> --- a/drivers/iio/adc/ti_am335x_adc.c
>> +++ b/drivers/iio/adc/ti_am335x_adc.c
>> @@ -146,7 +146,11 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
>>  	bool found = false;
>>  	u32 step_en;
>>  	unsigned long timeout = jiffies + usecs_to_jiffies
>> +#ifdef CONFIG_TOUCHSCREEN_TI_AM335X_TSC
>> +				(IDLE_TIMEOUT * TOTAL_CHANNELS);
>> +#else
>>  				(IDLE_TIMEOUT * adc_dev->channels);
>> +#endif
>>  	step_en = get_adc_step_mask(adc_dev);
>>  	am335x_tsc_se_set(adc_dev->mfd_tscadc, step_en);
>>  
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>