aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-08-06 08:59:04 -0400
committerMark Brown <broonie@linaro.org>2014-08-16 18:14:30 -0400
commit52fba2b85d30075490db023642632032371505c2 (patch)
tree53e4ecaf65a473d5401d65f2dd5e104f1575acd1
parent3e81b59208fa4697c6c3b6eefb92892b47f8b1e7 (diff)
spi: sh-msiof: Configure DMA slave bus width
The new Renesas R-Car Gen2 DMA Controller driver (rcar-dmac) requires explicit configuration of the DMA slave bus width. Hardcode the DMA transfer size to 4 bytes, as MSIOF DMA is limited to 32-bit words. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/spi/spi-sh-msiof.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 887c2084130f..b19cbb4cb4a0 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -987,10 +987,13 @@ static struct dma_chan *sh_msiof_request_dma_chan(struct device *dev,
987 memset(&cfg, 0, sizeof(cfg)); 987 memset(&cfg, 0, sizeof(cfg));
988 cfg.slave_id = id; 988 cfg.slave_id = id;
989 cfg.direction = dir; 989 cfg.direction = dir;
990 if (dir == DMA_MEM_TO_DEV) 990 if (dir == DMA_MEM_TO_DEV) {
991 cfg.dst_addr = port_addr; 991 cfg.dst_addr = port_addr;
992 else 992 cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
993 } else {
993 cfg.src_addr = port_addr; 994 cfg.src_addr = port_addr;
995 cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
996 }
994 997
995 ret = dmaengine_slave_config(chan, &cfg); 998 ret = dmaengine_slave_config(chan, &cfg);
996 if (ret) { 999 if (ret) {