1 files changed, 19 insertions, 10 deletions

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index e861157e3459..037abbb852a4 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -217,7 +217,6 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
                          struct spi_transfer *transfer)
 {
         struct spi_imx_data *spi_imx = spi_master_get_devdata(master);
-        unsigned int bytes_per_word, i;
 
         if (!master->dma_rx)
                 return false;
@@ -225,14 +224,6 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
         if (spi_imx->slave_mode)
                 return false;
 
-        bytes_per_word = spi_imx_bytes_per_word(transfer->bits_per_word);
-
-        for (i = spi_imx->devtype_data->fifo_size / 2; i > 0; i--) {
-                if (!(transfer->len % (i * bytes_per_word)))
-                        break;
-        }
-
-        spi_imx->wml = i;
         spi_imx->dynamic_burst = 0;
 
         return true;
@@ -594,7 +585,7 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx)
          * and enable DMA request.
          */
 
-        writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml) |
+        writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml - 1) |
                 MX51_ECSPI_DMA_TX_WML(spi_imx->wml) |
                 MX51_ECSPI_DMA_RXT_WML(spi_imx->wml) |
                 MX51_ECSPI_DMA_TEDEN | MX51_ECSPI_DMA_RXDEN |
@@ -1287,12 +1278,30 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx,
         unsigned long timeout;
         struct spi_master *master = spi_imx->bitbang.master;
         struct sg_table *tx = &transfer->tx_sg, *rx = &transfer->rx_sg;
+        struct scatterlist *last_sg = sg_last(rx->sgl, rx->nents);
+        unsigned int bytes_per_word, i;
         int ret;
 
+        /* Get the right burst length from the last sg to ensure no tail data */
+        bytes_per_word = spi_imx_bytes_per_word(transfer->bits_per_word);
+        for (i = spi_imx->devtype_data->fifo_size / 2; i > 0; i--) {
+                if (!(sg_dma_len(last_sg) % (i * bytes_per_word)))
+                        break;
+        }
+        /* Use 1 as wml in case no available burst length got */
+        if (i == 0)
+                i = 1;
+
+        spi_imx->wml =  i;
+
         ret = spi_imx_dma_configure(master);
         if (ret)
                 return ret;
 
+        if (!spi_imx->devtype_data->setup_wml) {
+                dev_err(spi_imx->dev, "No setup_wml()?\n");
+                return -EINVAL;
+        }
         spi_imx->devtype_data->setup_wml(spi_imx);
 
         /*