1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index f53f0c5e63da..4954f0ab1606 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1201,13 +1201,14 @@ static int atmel_spi_setup(struct spi_device *spi)
                 csr |= SPI_BIT(CSAAT);
 
         /* DLYBS is mostly irrelevant since we manage chipselect using GPIOs.
-         *
-         * DLYBCT would add delays between words, slowing down transfers.
-         * It could potentially be useful to cope with DMA bottlenecks, but
-         * in those cases it's probably best to just use a lower bitrate.
          */
         csr |= SPI_BF(DLYBS, 0);
-        csr |= SPI_BF(DLYBCT, 0);
+
+        /* DLYBCT adds delays between words.  This is useful for slow devices
+         * that need a bit of time to setup the next transfer.
+         */
+        csr |= SPI_BF(DLYBCT,
+                        (as->spi_clk / 1000000 * spi->word_delay_usecs) >> 5);
 
         asd = spi->controller_state;
         if (!asd) {