2 files changed, 8 insertions, 2 deletions

diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 0699edb437c4..fc3805ed69d1 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -16,6 +16,7 @@
 #ifndef TMIO_MMC_H
 #define TMIO_MMC_H
 
+#include <linux/dmaengine.h>
 #include <linux/highmem.h>
 #include <linux/mmc/tmio.h>
 #include <linux/mutex.h>
@@ -46,6 +47,7 @@ struct tmio_mmc_dma {
         void *chan_priv_rx;
         int slave_id_tx;
         int slave_id_rx;
+        enum dma_slave_buswidth dma_buswidth;
         bool (*filter)(struct dma_chan *chan, void *arg);
         void (*enable)(struct tmio_mmc_host *host, bool enable);
 };
diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c
index eb6b45cdb7ef..aa5f4b6e790d 100644
--- a/drivers/mmc/host/tmio_mmc_dma.c
+++ b/drivers/mmc/host/tmio_mmc_dma.c
@@ -293,7 +293,9 @@ void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdat
                         cfg.slave_id = host->dma->slave_id_tx;
                 cfg.direction = DMA_MEM_TO_DEV;
                 cfg.dst_addr = res->start + (CTL_SD_DATA_PORT << host->bus_shift);
-                cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+                cfg.dst_addr_width = host->dma->dma_buswidth;
+                if (!cfg.dst_addr_width)
+                        cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
                 cfg.src_addr = 0;
                 ret = dmaengine_slave_config(host->chan_tx, &cfg);
                 if (ret < 0)
@@ -312,7 +314,9 @@ void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdat
                         cfg.slave_id = host->dma->slave_id_rx;
                 cfg.direction = DMA_DEV_TO_MEM;
                 cfg.src_addr = cfg.dst_addr + host->pdata->dma_rx_offset;
-                cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+                cfg.src_addr_width = host->dma->dma_buswidth;
+                if (!cfg.src_addr_width)
+                        cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
                 cfg.dst_addr = 0;
                 ret = dmaengine_slave_config(host->chan_rx, &cfg);
                 if (ret < 0)