diff options
| author | Mark Brown | 2019-05-02 04:20:29 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-05-02 04:20:29 +0200 |
| commit | 2e5f081003f033d37be3faf052aaccc8b6a44aa5 (patch) | |
| tree | 6d07a9bfff47b20f997ecce96162b8ca9cf7b19c /drivers/spi/spi-orion.c | |
| parent | Merge branch 'spi-5.1' into spi-linus (diff) | |
| parent | spi: Clear SPI_CS_HIGH flag from bad_bits for GPIO chip-select (diff) | |
| download | kernel-qcow2-linux-2e5f081003f033d37be3faf052aaccc8b6a44aa5.tar.gz kernel-qcow2-linux-2e5f081003f033d37be3faf052aaccc8b6a44aa5.tar.xz kernel-qcow2-linux-2e5f081003f033d37be3faf052aaccc8b6a44aa5.zip | |
Merge branch 'spi-5.2' into spi-next
Diffstat (limited to 'drivers/spi/spi-orion.c')
| -rw-r--r-- | drivers/spi/spi-orion.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c index 7f280567093e..25ea4a9e0dbc 100644 --- a/drivers/spi/spi-orion.c +++ b/drivers/spi/spi-orion.c @@ -470,6 +470,8 @@ orion_spi_write_read(struct spi_device *spi, struct spi_transfer *xfer) if (orion_spi_write_read_8bit(spi, &tx, &rx) < 0) goto out; count--; + if (xfer->word_delay_usecs) + udelay(xfer->word_delay_usecs); } while (count); } else if (word_len == 16) { const u16 *tx = xfer->tx_buf; @@ -479,6 +481,8 @@ orion_spi_write_read(struct spi_device *spi, struct spi_transfer *xfer) if (orion_spi_write_read_16bit(spi, &tx, &rx) < 0) goto out; count -= 2; + if (xfer->word_delay_usecs) + udelay(xfer->word_delay_usecs); } while (count); } |