diff options
author | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:35 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:35 +0000 |
commit | ca4196aa10087fe3ba3ce2383761898dc95b5e94 (patch) | |
tree | f870402f36377f3bde4b939da23dda18bc9bc862 /drivers/spi/spi-tegra20-sflash.c | |
parent | Merge branch 'spi-5.4' into spi-linus (diff) | |
parent | dt-bindings: spi: Convert stm32 QSPI bindings to json-schema (diff) | |
download | linux-dev-ca4196aa10087fe3ba3ce2383761898dc95b5e94.tar.xz linux-dev-ca4196aa10087fe3ba3ce2383761898dc95b5e94.zip |
Merge branch 'spi-5.5' into spi-next
Diffstat (limited to 'drivers/spi/spi-tegra20-sflash.c')
-rw-r--r-- | drivers/spi/spi-tegra20-sflash.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c index a841a7250d14..514429379206 100644 --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c @@ -341,10 +341,11 @@ static int tegra_sflash_transfer_one_message(struct spi_master *master, goto exit; } msg->actual_length += xfer->len; - if (xfer->cs_change && xfer->delay_usecs) { + if (xfer->cs_change && + (xfer->delay_usecs || xfer->delay.value)) { tegra_sflash_writel(tsd, tsd->def_command_reg, SPI_COMMAND); - udelay(xfer->delay_usecs); + spi_transfer_delay_exec(xfer); } } ret = 0; |