| Message ID | 1407329949-5695-5-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a30b95a7d81cfc3442beb5a9635f22b19c97bbfc |
| Headers | show |
On Wed, Aug 06, 2014 at 02:59:01PM +0200, Geert Uytterhoeven wrote: > 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 1 byte for both directions, as that's > the only supported configuration (16-bit DMA support was removed in > commit 9c5de2c1754c2bb3c69c4d7bf0d0edc0a61d8232 ("spi: rspi: Remove > unused 16-bit DMA support")). Applied, thanks.
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index aa1c6a893570..6a4eb2d7f644 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -919,10 +919,13 @@ static struct dma_chan *rspi_request_dma_chan(struct device *dev, memset(&cfg, 0, sizeof(cfg)); cfg.slave_id = id; cfg.direction = dir; - if (dir == DMA_MEM_TO_DEV) + if (dir == DMA_MEM_TO_DEV) { cfg.dst_addr = port_addr; - else + cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; + } else { cfg.src_addr = port_addr; + cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; + } ret = dmaengine_slave_config(chan, &cfg); if (ret) {
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 1 byte for both directions, as that's the only supported configuration (16-bit DMA support was removed in commit 9c5de2c1754c2bb3c69c4d7bf0d0edc0a61d8232 ("spi: rspi: Remove unused 16-bit DMA support")). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/spi/spi-rspi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)