diff options
| author |   Thomas Zimmermann <tzimmermann@suse.de> | 2020-06-16 13:31:47 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2020-06-16 13:31:47 +0200 |
| commit | 4b3c1f1b15f576445c221cbc77a88540433a2ba7 (patch) | |
| tree | b88ac114c16fa1747205c9060bf00498bcb5df97 /drivers/fpga/ice40-spi.c | |
| parent | drm/ttm: Fix dma_fence refcnt leak when adding move fence (diff) | |
| parent | Linux 5.8-rc1 (diff) | |
| download | wireguard-linux-4b3c1f1b15f576445c221cbc77a88540433a2ba7.tar.xz wireguard-linux-4b3c1f1b15f576445c221cbc77a88540433a2ba7.zip | |
Merge v5.8-rc1 into drm-misc-fixes
Beginning a new release cycles for what will become v5.8. Updating
drm-misc-fixes accordingly.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
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; |