lkml.org 
[lkml]   [2016]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 012/142] spi: atmel: Fix DMA-setup for transfers with more than 8 bits per word
    Date
    From: David Mosberger-Tang <davidm@egauge.net>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/spi/spi-atmel.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
    index d4ac60b4a56e..72d21e87e649 100644
    --- a/drivers/spi/spi-atmel.c
    +++ b/drivers/spi/spi-atmel.c
    @@ -606,7 +606,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 */
    --
    2.7.1
    \
     
     \ /
      Last update: 2016-02-24 13:01    [W:2.138 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site