linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Franklin S Cooper Jr <fcooper@ti.com>,
	linux-input@vger.kernel.org, kernel@pengutronix.de
Subject: Re: [PATCH] Input: edt-ft5x06 - fix setting gain, offset, and threshold via device tree
Date: Tue, 9 Feb 2016 09:33:17 -0800	[thread overview]
Message-ID: <20160209173317.GA40460@dtor-ws> (raw)
In-Reply-To: <1455038558-27471-1-git-send-email-p.zabel@pengutronix.de>

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@pengutronix.de>

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

      reply	other threads:[~2016-02-09 17:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-09 17:22 [PATCH] Input: edt-ft5x06 - fix setting gain, offset, and threshold via device tree Philipp Zabel
2016-02-09 17:33 ` Dmitry Torokhov [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160209173317.GA40460@dtor-ws \
    --to=dmitry.torokhov@gmail.com \
    --cc=fcooper@ti.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-input@vger.kernel.org \
    --cc=p.zabel@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).