Merge branch 'dma_slave_direction' into next_test_dirn

resolved conflicts:
	drivers/media/video/mx3_camera.c

3 files changed, 8 insertions, 8 deletions

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 00233af1acc4..e4d5a21e1a63 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -268,7 +268,7 @@ static void pl011_dma_probe_initcall(struct uart_amba_port *uap)
         struct dma_slave_config tx_conf = {
                 .dst_addr = uap->port.mapbase + UART01x_DR,
                 .dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
-                .direction = DMA_TO_DEVICE,
+                .direction = DMA_MEM_TO_DEV,
                 .dst_maxburst = uap->fifosize >> 1,
         };
         struct dma_chan *chan;
@@ -301,7 +301,7 @@ static void pl011_dma_probe_initcall(struct uart_amba_port *uap)
                 struct dma_slave_config rx_conf = {
                         .src_addr = uap->port.mapbase + UART01x_DR,
                         .src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
-                        .direction = DMA_FROM_DEVICE,
+                        .direction = DMA_DEV_TO_MEM,
                         .src_maxburst = uap->fifosize >> 1,
                 };
 
@@ -480,7 +480,7 @@ static int pl011_dma_tx_refill(struct uart_amba_port *uap)
                 return -EBUSY;
         }
 
-        desc = dma_dev->device_prep_slave_sg(chan, &dmatx->sg, 1, DMA_TO_DEVICE,
+        desc = dma_dev->device_prep_slave_sg(chan, &dmatx->sg, 1, DMA_MEM_TO_DEV,
                                              DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 dma_unmap_sg(dma_dev->dev, &dmatx->sg, 1, DMA_TO_DEVICE);
@@ -676,7 +676,7 @@ static int pl011_dma_rx_trigger_dma(struct uart_amba_port *uap)
                 &uap->dmarx.sgbuf_b : &uap->dmarx.sgbuf_a;
         dma_dev = rxchan->device;
         desc = rxchan->device->device_prep_slave_sg(rxchan, &sgbuf->sg, 1,
-                                        DMA_FROM_DEVICE,
+                                        DMA_DEV_TO_MEM,
                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         /*
          * If the DMA engine is busy and cannot prepare a
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 21febef926aa..6b8019c5b36d 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -749,7 +749,7 @@ static int dma_handle_rx(struct eg20t_port *priv)
         sg_dma_address(sg) = priv->rx_buf_dma;
 
         desc = priv->chan_rx->device->device_prep_slave_sg(priv->chan_rx,
-                        sg, 1, DMA_FROM_DEVICE,
+                        sg, 1, DMA_DEV_TO_MEM,
                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 
         if (!desc)
@@ -908,7 +908,7 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)
         }
 
         desc = priv->chan_tx->device->device_prep_slave_sg(priv->chan_tx,
-                                        priv->sg_tx_p, nent, DMA_TO_DEVICE,
+                                        priv->sg_tx_p, nent, DMA_MEM_TO_DEV,
                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 dev_err(priv->port.dev, "%s:device_prep_slave_sg Failed\n",
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 1945c70539c2..9900e8560452 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1214,7 +1214,7 @@ static void sci_submit_rx(struct sci_port *s)
                 struct dma_async_tx_descriptor *desc;
 
                 desc = chan->device->device_prep_slave_sg(chan,
-                        sg, 1, DMA_FROM_DEVICE, DMA_PREP_INTERRUPT);
+                        sg, 1, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT);
 
                 if (desc) {
                         s->desc_rx[i] = desc;
@@ -1329,7 +1329,7 @@ static void work_fn_tx(struct work_struct *work)
         BUG_ON(!sg_dma_len(sg));
 
         desc = chan->device->device_prep_slave_sg(chan,
-                        sg, s->sg_len_tx, DMA_TO_DEVICE,
+                        sg, s->sg_len_tx, DMA_MEM_TO_DEV,
                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 /* switch to PIO */