From 86da179394ce3737e52763280770b2fba555773c Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Wed, 10 Apr 2013 16:58:27 +0300 Subject: [PATCH] --- yaml --- r: 364303 b: refs/heads/master c: ab19479aa1b9708110bc90ba5b6c03b013feaa46 h: refs/heads/master i: 364301: cb285f4a9587276bf836c29dfed7730f12221397 364299: 73b50b525009bf8c5bb643982900a5b80e191006 364295: c99b720f01966f99641680e26af7b7f08b6768cc 364287: 034af96b57df450eb6a8acab04e9850878167a7f v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/8250/8250_dma.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b7e71ec0b92c..9166d3883cbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4fb3b88ebf21e6127ed0e91336752352ba0931e +refs/heads/master: ab19479aa1b9708110bc90ba5b6c03b013feaa46 diff --git a/trunk/drivers/tty/serial/8250/8250_dma.c b/trunk/drivers/tty/serial/8250/8250_dma.c index fdb6139e8c17..7046769608d4 100644 --- a/trunk/drivers/tty/serial/8250/8250_dma.c +++ b/trunk/drivers/tty/serial/8250/8250_dma.c @@ -149,8 +149,14 @@ int serial8250_request_dma(struct uart_8250_port *p) struct uart_8250_dma *dma = p->dma; dma_cap_mask_t mask; - dma->rxconf.src_addr = p->port.mapbase + UART_RX; - dma->txconf.dst_addr = p->port.mapbase + UART_TX; + /* Default slave configuration parameters */ + dma->rxconf.direction = DMA_DEV_TO_MEM; + dma->rxconf.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; + dma->rxconf.src_addr = p->port.mapbase + UART_RX; + + dma->txconf.direction = DMA_MEM_TO_DEV; + dma->txconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; + dma->txconf.dst_addr = p->port.mapbase + UART_TX; dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask);