]> git.hungrycats.org Git - linux/commitdiff
tty/serial: at91: maxburst was missing for dma transfers
authorLudovic Desroches <ludovic.desroches@atmel.com>
Thu, 16 Apr 2015 14:58:12 +0000 (16:58 +0200)
committerJiri Slaby <jslaby@suse.cz>
Fri, 15 May 2015 07:10:48 +0000 (09:10 +0200)
commit a8d4e01637902311c5643b69a5c80e2805f04054 upstream.

Maxburst was not set when doing the dma slave configuration. This value
is checked by the recently introduced xdmac. It causes an error when
doing the slave configuration and so prevents from using dma.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/tty/serial/atmel_serial.c

index ebdc00f184a142754a95627d204a6538aacae857..ab2e22bf54fdec767fa715bb1d0b74df50c872cc 100644 (file)
@@ -756,6 +756,7 @@ static int atmel_prepare_tx_dma(struct uart_port *port)
        config.direction = DMA_MEM_TO_DEV;
        config.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
        config.dst_addr = port->mapbase + ATMEL_US_THR;
+       config.dst_maxburst = 1;
 
        ret = dmaengine_device_control(atmel_port->chan_tx,
                                        DMA_SLAVE_CONFIG,
@@ -920,6 +921,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port)
        config.direction = DMA_DEV_TO_MEM;
        config.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
        config.src_addr = port->mapbase + ATMEL_US_RHR;
+       config.src_maxburst = 1;
 
        ret = dmaengine_device_control(atmel_port->chan_rx,
                                        DMA_SLAVE_CONFIG,