diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-06-17 12:39:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-17 12:39:12 +0100 |
| commit | 6870112c46c867f50cd27570860a05bd82614b5c (patch) | |
| tree | bd9f13f6ab25072809564460a34bf0fb40900069 /drivers/fpga/ice40-spi.c | |
| parent | regualtor: pfuze100: correct sw1a/sw2 on pfuze3000 (diff) | |
| parent | Linux 5.8-rc1 (diff) | |
| download | wireguard-linux-6870112c46c867f50cd27570860a05bd82614b5c.tar.xz wireguard-linux-6870112c46c867f50cd27570860a05bd82614b5c.zip | |
Merge tag 'v5.8-rc1' into regulator-5.8
Linux 5.8-rc1
Diffstat (limited to 'drivers/fpga/ice40-spi.c')
| -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; |