]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: atmel: Fix DMA-setup for transfers with more than 8 bits per word
authorDavid Mosberger-Tang <davidm@egauge.net>
Tue, 20 Oct 2015 12:26:47 +0000 (14:26 +0200)
committerLuis Henriques <luis.henriques@canonical.com>
Sun, 13 Dec 2015 17:48:53 +0000 (17:48 +0000)
commit 06515f83908d038d9e12ffa3dcca27a1b67f2de0 upstream.

The DMA-slave configuration depends on the whether <= 8 or > 8 bits
are transferred per word, so we need to call
atmel_spi_dma_slave_config() with the correct value.

Signed-off-by: David Mosberger <davidm@egauge.net>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/spi/spi-atmel.c

index a65823bddf01cb60b90de830ed979b98ee596366..bbf7c5e79b95035a085483a9fc0faddb6a313178 100644 (file)
@@ -593,7 +593,8 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
 
        *plen = len;
 
-       if (atmel_spi_dma_slave_config(as, &slave_config, 8))
+       if (atmel_spi_dma_slave_config(as, &slave_config,
+                                      xfer->bits_per_word))
                goto err_exit;
 
        /* Send both scatterlists */