diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2020-06-30 11:32:02 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2020-06-30 11:32:02 +0200 |
| commit | 77346a704c913268a2dad68d59523fd85dc74088 (patch) | |
| tree | 62c66bcb163b0db42a1fd0a397a6973e52f4ddce /drivers/fpga/ice40-spi.c | |
| parent | iommu/qcom: add optional 'tbu' clock for TLB invalidate (diff) | |
| parent | Linux 5.8-rc3 (diff) | |
| download | wireguard-linux-77346a704c913268a2dad68d59523fd85dc74088.tar.xz wireguard-linux-77346a704c913268a2dad68d59523fd85dc74088.zip | |
Merge tag 'v5.8-rc3' into arm/qcom
Linux 5.8-rc3
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; |