[PATCH] platform: chrome: cros_ec_spi: Use new structure for SPI transfer delays

[PATCH] platform: chrome: cros_ec_spi: Use new structure for SPI transfer delays

[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/platform/chrome/cros_ec_spi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c
index 46786d2d679a..665ab154bb4f 100644
--- a/drivers/platform/chrome/cros_ec_spi.c
+++ b/drivers/platform/chrome/cros_ec_spi.c
@@ -127,7 +127,8 @@ static int terminate_request(struct cros_ec_device *ec_dev)
 	 */
 	spi_message_init(&msg);
 	memset(&trans, 0, sizeof(trans));
-	trans.delay_usecs = ec_spi->end_of_msg_delay;
+	trans.delay.value = ec_spi->end_of_msg_delay;
+	trans.delay.unit = SPI_DELAY_UNIT_NSECS;
 	spi_message_add_tail(&trans, &msg);
 
 	ret = spi_sync_locked(ec_spi->spi, &msg);
@@ -416,7 +417,8 @@ static int do_cros_ec_pkt_xfer_spi(struct cros_ec_device *ec_dev,
 	spi_message_init(&msg);
 	if (ec_spi->start_of_msg_delay) {
 		memset(&trans_delay, 0, sizeof(trans_delay));
-		trans_delay.delay_usecs = ec_spi->start_of_msg_delay;
+		trans_delay.delay.value = ec_spi->start_of_msg_delay;
+		trans_delay.delay.unit = SPI_DELAY_UNIT_USECS;
 		spi_message_add_tail(&trans_delay, &msg);
 	}
 
-- 
2.17.1

Re: [PATCH] platform: chrome: cros_ec_spi: Use new structure for SPI transfer delays

[Enric Balletbo i Serra]

Hi Sergiu

On 27/2/20 15:09, 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 for 5.7

>  drivers/platform/chrome/cros_ec_spi.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c
> index 46786d2d679a..665ab154bb4f 100644
> --- a/drivers/platform/chrome/cros_ec_spi.c
> +++ b/drivers/platform/chrome/cros_ec_spi.c
> @@ -127,7 +127,8 @@ static int terminate_request(struct cros_ec_device *ec_dev)
>  	 */
>  	spi_message_init(&msg);
>  	memset(&trans, 0, sizeof(trans));
> -	trans.delay_usecs = ec_spi->end_of_msg_delay;
> +	trans.delay.value = ec_spi->end_of_msg_delay;
> +	trans.delay.unit = SPI_DELAY_UNIT_NSECS;
>  	spi_message_add_tail(&trans, &msg);
>  
>  	ret = spi_sync_locked(ec_spi->spi, &msg);
> @@ -416,7 +417,8 @@ static int do_cros_ec_pkt_xfer_spi(struct cros_ec_device *ec_dev,
>  	spi_message_init(&msg);
>  	if (ec_spi->start_of_msg_delay) {
>  		memset(&trans_delay, 0, sizeof(trans_delay));
> -		trans_delay.delay_usecs = ec_spi->start_of_msg_delay;
> +		trans_delay.delay.value = ec_spi->start_of_msg_delay;
> +		trans_delay.delay.unit = SPI_DELAY_UNIT_USECS;
>  		spi_message_add_tail(&trans_delay, &msg);
>  	}
>  
>