On Tue, 10 Dec 2019 16:07:55 +0200
Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx> 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@xxxxxxxxxx>
Applied to the togreg branch of iio.git and pushed out as testing
for all the normal reasons.
Thanks,
Jonathan
> ---
>
> Changelog v1 -> v2:
> * fixed typo in commit desc `delay_secs` -> `delay_usecs`
>
> drivers/iio/imu/adis.c | 27 ++++++++++++++++++---------
> 1 file changed, 18 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/iio/imu/adis.c b/drivers/iio/imu/adis.c
> index e14c8536fd09..3cc57ef22b2e 100644
> --- a/drivers/iio/imu/adis.c
> +++ b/drivers/iio/imu/adis.c
> @@ -38,7 +38,8 @@ int adis_write_reg(struct adis *adis, unsigned int reg,
> .bits_per_word = 8,
> .len = 2,
> .cs_change = 1,
> - .delay_usecs = adis->data->write_delay,
> + .delay.value = adis->data->write_delay,
> + .delay.unit = SPI_DELAY_UNIT_USECS,
> .cs_change_delay.value = adis->data->cs_change_delay,
> .cs_change_delay.unit = SPI_DELAY_UNIT_USECS,
> }, {
> @@ -46,7 +47,8 @@ int adis_write_reg(struct adis *adis, unsigned int reg,
> .bits_per_word = 8,
> .len = 2,
> .cs_change = 1,
> - .delay_usecs = adis->data->write_delay,
> + .delay.value = adis->data->write_delay,
> + .delay.unit = SPI_DELAY_UNIT_USECS,
> .cs_change_delay.value = adis->data->cs_change_delay,
> .cs_change_delay.unit = SPI_DELAY_UNIT_USECS,
> }, {
> @@ -54,19 +56,22 @@ int adis_write_reg(struct adis *adis, unsigned int reg,
> .bits_per_word = 8,
> .len = 2,
> .cs_change = 1,
> - .delay_usecs = adis->data->write_delay,
> + .delay.value = adis->data->write_delay,
> + .delay.unit = SPI_DELAY_UNIT_USECS,
> .cs_change_delay.value = adis->data->cs_change_delay,
> .cs_change_delay.unit = SPI_DELAY_UNIT_USECS,
> }, {
> .tx_buf = adis->tx + 6,
> .bits_per_word = 8,
> .len = 2,
> - .delay_usecs = adis->data->write_delay,
> + .delay.value = adis->data->write_delay,
> + .delay.unit = SPI_DELAY_UNIT_USECS,
> }, {
> .tx_buf = adis->tx + 8,
> .bits_per_word = 8,
> .len = 2,
> - .delay_usecs = adis->data->write_delay,
> + .delay.value = adis->data->write_delay,
> + .delay.unit = SPI_DELAY_UNIT_USECS,
> },
> };
>
> @@ -138,7 +143,8 @@ int adis_read_reg(struct adis *adis, unsigned int reg,
> .bits_per_word = 8,
> .len = 2,
> .cs_change = 1,
> - .delay_usecs = adis->data->write_delay,
> + .delay.value = adis->data->write_delay,
> + .delay.unit = SPI_DELAY_UNIT_USECS,
> .cs_change_delay.value = adis->data->cs_change_delay,
> .cs_change_delay.unit = SPI_DELAY_UNIT_USECS,
> }, {
> @@ -146,7 +152,8 @@ int adis_read_reg(struct adis *adis, unsigned int reg,
> .bits_per_word = 8,
> .len = 2,
> .cs_change = 1,
> - .delay_usecs = adis->data->read_delay,
> + .delay.value = adis->data->read_delay,
> + .delay.unit = SPI_DELAY_UNIT_USECS,
> .cs_change_delay.value = adis->data->cs_change_delay,
> .cs_change_delay.unit = SPI_DELAY_UNIT_USECS,
> }, {
> @@ -155,14 +162,16 @@ int adis_read_reg(struct adis *adis, unsigned int reg,
> .bits_per_word = 8,
> .len = 2,
> .cs_change = 1,
> - .delay_usecs = adis->data->read_delay,
> + .delay.value = adis->data->read_delay,
> + .delay.unit = SPI_DELAY_UNIT_USECS,
> .cs_change_delay.value = adis->data->cs_change_delay,
> .cs_change_delay.unit = SPI_DELAY_UNIT_USECS,
> }, {
> .rx_buf = adis->rx + 2,
> .bits_per_word = 8,
> .len = 2,
> - .delay_usecs = adis->data->read_delay,
> + .delay.value = adis->data->read_delay,
> + .delay.unit = SPI_DELAY_UNIT_USECS,
> },
> };
>
