Re: [PATCH] Input: edt-ft5x06 - fix setting gain, offset, and threshold via device tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Feb 09, 2016 at 06:22:38PM +0100, Philipp Zabel wrote:
> A recent patch broke parsing the gain, offset, and threshold parameters
> from device tree. Instead of setting the cached values and writing them
> to the correct registers during probe, it would write the values from DT
> into the register address variables and never write them to the chip
> during normal operation.
> 
> Fixes: 2e23b7a96372 ("Input: edt-ft5x06 - use generic properties API")
> Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>

Applied, thank you.

> ---
>  drivers/input/touchscreen/edt-ft5x06.c | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
> index 0b0f8c1..23fbe38 100644
> --- a/drivers/input/touchscreen/edt-ft5x06.c
> +++ b/drivers/input/touchscreen/edt-ft5x06.c
> @@ -822,16 +822,22 @@ static void edt_ft5x06_ts_get_defaults(struct device *dev,
>  	int error;
>  
>  	error = device_property_read_u32(dev, "threshold", &val);
> -	if (!error)
> -		reg_addr->reg_threshold = val;
> +	if (!error) {
> +		edt_ft5x06_register_write(tsdata, reg_addr->reg_threshold, val);
> +		tsdata->threshold = val;
> +	}
>  
>  	error = device_property_read_u32(dev, "gain", &val);
> -	if (!error)
> -		reg_addr->reg_gain = val;
> +	if (!error) {
> +		edt_ft5x06_register_write(tsdata, reg_addr->reg_gain, val);
> +		tsdata->gain = val;
> +	}
>  
>  	error = device_property_read_u32(dev, "offset", &val);
> -	if (!error)
> -		reg_addr->reg_offset = val;
> +	if (!error) {
> +		edt_ft5x06_register_write(tsdata, reg_addr->reg_offset, val);
> +		tsdata->offset = val;
> +	}
>  }
>  
>  static void
> -- 
> 2.7.0.rc3
> 

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Media Devel]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Linux Wireless Networking]     [Linux Omap]

  Powered by Linux