linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] input: keyboard: applespi: Use new structure for SPI transfer delays
@ 2020-02-27 12:45 Sergiu Cuciurean
  2020-02-29  3:26 ` Life is hard, and then you die
  2020-12-11  5:57 ` Dmitry Torokhov
  0 siblings, 2 replies; 5+ messages in thread
From: Sergiu Cuciurean @ 2020-02-27 12:45 UTC (permalink / raw)
  To: linux-kernel, linux-input, dmitry.torokhov, nikolas, gregkh
  Cc: ronald, andriy.shevchenko, maowenan, Sergiu Cuciurean

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 bebcfd272df6 ("spi: introduce `delay` field for
`spi_transfer` + spi_transfer_delay_exec()")

Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
---
 drivers/input/keyboard/applespi.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/input/keyboard/applespi.c b/drivers/input/keyboard/applespi.c
index d38398526965..d6a847e5f7e4 100644
--- a/drivers/input/keyboard/applespi.c
+++ b/drivers/input/keyboard/applespi.c
@@ -545,7 +545,8 @@ static void applespi_setup_read_txfrs(struct applespi_data *applespi)
 	memset(dl_t, 0, sizeof(*dl_t));
 	memset(rd_t, 0, sizeof(*rd_t));
 
-	dl_t->delay_usecs = applespi->spi_settings.spi_cs_delay;
+	dl_t->delay.value = applespi->spi_settings.spi_cs_delay;
+	dl_t->delay.unit = SPI_DELAY_UNIT_USECS;
 
 	rd_t->rx_buf = applespi->rx_buffer;
 	rd_t->len = APPLESPI_PACKET_SIZE;
@@ -574,14 +575,17 @@ static void applespi_setup_write_txfrs(struct applespi_data *applespi)
 	 * end up with an extra unnecessary (but harmless) cs assertion and
 	 * deassertion.
 	 */
-	wt_t->delay_usecs = SPI_RW_CHG_DELAY_US;
+	wt_t->delay.value = SPI_RW_CHG_DELAY_US;
+	wt_t->delay.unit = SPI_DELAY_UNIT_USECS;
 	wt_t->cs_change = 1;
 
-	dl_t->delay_usecs = applespi->spi_settings.spi_cs_delay;
+	dl_t->delay.value = applespi->spi_settings.spi_cs_delay;
+	dl_t->delay.unit = SPI_DELAY_UNIT_USECS;
 
 	wr_t->tx_buf = applespi->tx_buffer;
 	wr_t->len = APPLESPI_PACKET_SIZE;
-	wr_t->delay_usecs = SPI_RW_CHG_DELAY_US;
+	wr_t->delay.value = SPI_RW_CHG_DELAY_US;
+	wr_t->delay.unit = SPI_DELAY_UNIT_USECS;
 
 	st_t->rx_buf = applespi->tx_status;
 	st_t->len = APPLESPI_STATUS_SIZE;
-- 
2.17.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] input: keyboard: applespi: Use new structure for SPI transfer delays
  2020-02-27 12:45 [PATCH] input: keyboard: applespi: Use new structure for SPI transfer delays Sergiu Cuciurean
@ 2020-02-29  3:26 ` Life is hard, and then you die
  2020-03-02 11:09   ` Andy Shevchenko
  2020-12-11  5:57 ` Dmitry Torokhov
  1 sibling, 1 reply; 5+ messages in thread
From: Life is hard, and then you die @ 2020-02-29  3:26 UTC (permalink / raw)
  To: Sergiu Cuciurean
  Cc: linux-kernel, linux-input, dmitry.torokhov, nikolas, gregkh,
	andriy.shevchenko, maowenan


On Thu, Feb 27, 2020 at 02:45:34PM +0200, Sergiu Cuciurean 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 bebcfd272df6 ("spi: introduce `delay` field for
> `spi_transfer` + spi_transfer_delay_exec()")
> 
> Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
> ---
>  drivers/input/keyboard/applespi.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/input/keyboard/applespi.c b/drivers/input/keyboard/applespi.c
> index d38398526965..d6a847e5f7e4 100644
> --- a/drivers/input/keyboard/applespi.c
> +++ b/drivers/input/keyboard/applespi.c
> @@ -545,7 +545,8 @@ static void applespi_setup_read_txfrs(struct applespi_data *applespi)
>  	memset(dl_t, 0, sizeof(*dl_t));
>  	memset(rd_t, 0, sizeof(*rd_t));
>  
> -	dl_t->delay_usecs = applespi->spi_settings.spi_cs_delay;
> +	dl_t->delay.value = applespi->spi_settings.spi_cs_delay;
> +	dl_t->delay.unit = SPI_DELAY_UNIT_USECS;
>  
>  	rd_t->rx_buf = applespi->rx_buffer;
>  	rd_t->len = APPLESPI_PACKET_SIZE;
> @@ -574,14 +575,17 @@ static void applespi_setup_write_txfrs(struct applespi_data *applespi)
>  	 * end up with an extra unnecessary (but harmless) cs assertion and
>  	 * deassertion.
>  	 */
> -	wt_t->delay_usecs = SPI_RW_CHG_DELAY_US;
> +	wt_t->delay.value = SPI_RW_CHG_DELAY_US;
> +	wt_t->delay.unit = SPI_DELAY_UNIT_USECS;
>  	wt_t->cs_change = 1;
>  
> -	dl_t->delay_usecs = applespi->spi_settings.spi_cs_delay;
> +	dl_t->delay.value = applespi->spi_settings.spi_cs_delay;
> +	dl_t->delay.unit = SPI_DELAY_UNIT_USECS;
>  
>  	wr_t->tx_buf = applespi->tx_buffer;
>  	wr_t->len = APPLESPI_PACKET_SIZE;
> -	wr_t->delay_usecs = SPI_RW_CHG_DELAY_US;
> +	wr_t->delay.value = SPI_RW_CHG_DELAY_US;
> +	wr_t->delay.unit = SPI_DELAY_UNIT_USECS;
>  
>  	st_t->rx_buf = applespi->tx_status;
>  	st_t->len = APPLESPI_STATUS_SIZE;
> -- 
> 2.17.1

Looks good to me and tested to confirm things still work.


  Cheers,

  Ronald


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] input: keyboard: applespi: Use new structure for SPI transfer delays
  2020-02-29  3:26 ` Life is hard, and then you die
@ 2020-03-02 11:09   ` Andy Shevchenko
  2020-03-03  6:03     ` Life is hard, and then you die
  0 siblings, 1 reply; 5+ messages in thread
From: Andy Shevchenko @ 2020-03-02 11:09 UTC (permalink / raw)
  To: Life is hard, and then you die
  Cc: Sergiu Cuciurean, linux-kernel, linux-input, dmitry.torokhov,
	nikolas, gregkh, maowenan

On Fri, Feb 28, 2020 at 07:26:16PM -0800, Life is hard, and then you die wrote:
> On Thu, Feb 27, 2020 at 02:45:34PM +0200, Sergiu Cuciurean wrote:

...

> > -	wr_t->delay_usecs = SPI_RW_CHG_DELAY_US;
> > +	wr_t->delay.value = SPI_RW_CHG_DELAY_US;
> > +	wr_t->delay.unit = SPI_DELAY_UNIT_USECS;
> 
> Looks good to me and tested to confirm things still work.

Ronald, we have the established tags for such, like Tested-by:, Reviewed-by:.

-- 
With Best Regards,
Andy Shevchenko



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] input: keyboard: applespi: Use new structure for SPI transfer delays
  2020-03-02 11:09   ` Andy Shevchenko
@ 2020-03-03  6:03     ` Life is hard, and then you die
  0 siblings, 0 replies; 5+ messages in thread
From: Life is hard, and then you die @ 2020-03-03  6:03 UTC (permalink / raw)
  To: Andy Shevchenko
  Cc: Sergiu Cuciurean, linux-kernel, linux-input, dmitry.torokhov,
	nikolas, gregkh, maowenan


On Mon, Mar 02, 2020 at 01:09:32PM +0200, Andy Shevchenko wrote:
> On Fri, Feb 28, 2020 at 07:26:16PM -0800, Life is hard, and then you die wrote:
> > On Thu, Feb 27, 2020 at 02:45:34PM +0200, Sergiu Cuciurean wrote:
> 
> ...
> 
> > > -	wr_t->delay_usecs = SPI_RW_CHG_DELAY_US;
> > > +	wr_t->delay.value = SPI_RW_CHG_DELAY_US;
> > > +	wr_t->delay.unit = SPI_DELAY_UNIT_USECS;
> > 
> > Looks good to me and tested to confirm things still work.
> 
> Ronald, we have the established tags for such, like Tested-by:, Reviewed-by:.

Apologies, that was sloppy of me. So:

Tested-by: Ronald Tschalär <ronald@innovation.ch>
Reviewed-by: Ronald Tschalär <ronald@innovation.ch>


  Cheers,

  Ronald


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] input: keyboard: applespi: Use new structure for SPI transfer delays
  2020-02-27 12:45 [PATCH] input: keyboard: applespi: Use new structure for SPI transfer delays Sergiu Cuciurean
  2020-02-29  3:26 ` Life is hard, and then you die
@ 2020-12-11  5:57 ` Dmitry Torokhov
  1 sibling, 0 replies; 5+ messages in thread
From: Dmitry Torokhov @ 2020-12-11  5:57 UTC (permalink / raw)
  To: Sergiu Cuciurean
  Cc: linux-kernel, linux-input, nikolas, gregkh, ronald,
	andriy.shevchenko, maowenan

On Thu, Feb 27, 2020 at 02:45:34PM +0200, Sergiu Cuciurean 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 bebcfd272df6 ("spi: introduce `delay` field for
> `spi_transfer` + spi_transfer_delay_exec()")
> 
> Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>

Applied, thank you.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-12-11  5:59 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-27 12:45 [PATCH] input: keyboard: applespi: Use new structure for SPI transfer delays Sergiu Cuciurean
2020-02-29  3:26 ` Life is hard, and then you die
2020-03-02 11:09   ` Andy Shevchenko
2020-03-03  6:03     ` Life is hard, and then you die
2020-12-11  5:57 ` Dmitry Torokhov

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).