From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Alexandru Ardelean <alexandru.ardelean@analog.com>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
info@metux.net, tglx@linutronix.de, m.felsch@pengutronix.de
Subject: Re: [PATCH] Input: ads7846: use new `delay` structure for SPI transfer delays
Date: Fri, 10 Jan 2020 15:39:44 -0800 [thread overview]
Message-ID: <20200110233944.GW8314@dtor-ws> (raw)
In-Reply-To: <20191210141103.15910-1-alexandru.ardelean@analog.com>
On Tue, Dec 10, 2019 at 04:11:03PM +0200, Alexandru Ardelean wrote:
> In a recent change to the SPI subsystem [1], a new `delay` struct was added
> to replace the `delay_usecs`. This change replaces the current `delay_usecs`
> with `delay` for this driver.
>
> The `spi_transfer_delay_exec()` function [in the SPI framework] makes sure
> that both `delay_usecs` & `delay` are used (in this order to preserve
> backwards compatibility).
>
> [1] commit bebcfd272df6485 ("spi: introduce `delay` field for
> `spi_transfer` + spi_transfer_delay_exec()")
>
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Applied, thank you.
> ---
> drivers/input/touchscreen/ads7846.c | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
> index 51ddb204ca1b..8fd7fc39c4fd 100644
> --- a/drivers/input/touchscreen/ads7846.c
> +++ b/drivers/input/touchscreen/ads7846.c
> @@ -333,7 +333,8 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
> req->xfer[1].len = 2;
>
> /* for 1uF, settle for 800 usec; no cap, 100 usec. */
> - req->xfer[1].delay_usecs = ts->vref_delay_usecs;
> + req->xfer[1].delay.value = ts->vref_delay_usecs;
> + req->xfer[1].delay.unit = SPI_DELAY_UNIT_USECS;
> spi_message_add_tail(&req->xfer[1], &req->msg);
>
> /* Enable reference voltage */
> @@ -1018,7 +1019,8 @@ static void ads7846_setup_spi_msg(struct ads7846 *ts,
> * have had enough time to stabilize.
> */
> if (pdata->settle_delay_usecs) {
> - x->delay_usecs = pdata->settle_delay_usecs;
> + x->delay.value = pdata->settle_delay_usecs;
> + x->delay.unit = SPI_DELAY_UNIT_USECS;
>
> x++;
> x->tx_buf = &packet->read_y;
> @@ -1061,7 +1063,8 @@ static void ads7846_setup_spi_msg(struct ads7846 *ts,
>
> /* ... maybe discard first sample ... */
> if (pdata->settle_delay_usecs) {
> - x->delay_usecs = pdata->settle_delay_usecs;
> + x->delay.value = pdata->settle_delay_usecs;
> + x->delay.unit = SPI_DELAY_UNIT_USECS;
>
> x++;
> x->tx_buf = &packet->read_x;
> @@ -1094,7 +1097,8 @@ static void ads7846_setup_spi_msg(struct ads7846 *ts,
>
> /* ... maybe discard first sample ... */
> if (pdata->settle_delay_usecs) {
> - x->delay_usecs = pdata->settle_delay_usecs;
> + x->delay.value = pdata->settle_delay_usecs;
> + x->delay.unit = SPI_DELAY_UNIT_USECS;
>
> x++;
> x->tx_buf = &packet->read_z1;
> @@ -1125,7 +1129,8 @@ static void ads7846_setup_spi_msg(struct ads7846 *ts,
>
> /* ... maybe discard first sample ... */
> if (pdata->settle_delay_usecs) {
> - x->delay_usecs = pdata->settle_delay_usecs;
> + x->delay.value = pdata->settle_delay_usecs;
> + x->delay.unit = SPI_DELAY_UNIT_USECS;
>
> x++;
> x->tx_buf = &packet->read_z2;
> --
> 2.20.1
>
--
Dmitry
prev parent reply other threads:[~2020-01-10 23:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 14:11 [PATCH] Input: ads7846: use new `delay` structure for SPI transfer delays Alexandru Ardelean
2020-01-10 23:39 ` 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=20200110233944.GW8314@dtor-ws \
--to=dmitry.torokhov@gmail.com \
--cc=alexandru.ardelean@analog.com \
--cc=info@metux.net \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.felsch@pengutronix.de \
--cc=tglx@linutronix.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).