diff options
| author | Sergiu Cuciurean <sergiu.cuciurean@analog.com> | 2020-02-27 15:09:32 +0300 |
|---|---|---|
| committer | Moritz Fischer <mdf@kernel.org> | 2020-04-30 06:37:08 +0300 |
| commit | 1493674ba3c0f0d48f5f1bdd8a32cbc3bb7be619 (patch) | |
| tree | 9a8b4e7d9156f7d388f708136a810c9c1fbdc958 | |
| parent | b6862193ca12e4bce6a18f31bb36eaa6d801b377 (diff) | |
| download | linux-1493674ba3c0f0d48f5f1bdd8a32cbc3bb7be619.tar.xz | |
fpga: ice40-spi: Use new structure for SPI transfer delays
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>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
| -rw-r--r-- | drivers/fpga/ice40-spi.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c index 56e112e14a10..8d689fea0dab 100644 --- a/drivers/fpga/ice40-spi.c +++ b/drivers/fpga/ice40-spi.c @@ -46,10 +46,16 @@ static int ice40_fpga_ops_write_init(struct fpga_manager *mgr, struct spi_message message; struct spi_transfer assert_cs_then_reset_delay = { .cs_change = 1, - .delay_usecs = ICE40_SPI_RESET_DELAY + .delay = { + .value = ICE40_SPI_RESET_DELAY, + .unit = SPI_DELAY_UNIT_USECS + } }; struct spi_transfer housekeeping_delay_then_release_cs = { - .delay_usecs = ICE40_SPI_HOUSEKEEPING_DELAY + .delay = { + .value = ICE40_SPI_HOUSEKEEPING_DELAY, + .unit = SPI_DELAY_UNIT_USECS + } }; int ret; |