Merge branch 'dma_slave_direction' into next_test_dirn

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

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 186b8221803e..e0da795bdcb3 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -320,14 +320,14 @@ static int pl330_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, unsigned
         case DMA_SLAVE_CONFIG:
                 slave_config = (struct dma_slave_config *)arg;
 
-                if (slave_config->direction == DMA_TO_DEVICE) {
+                if (slave_config->direction == DMA_MEM_TO_DEV) {
                         if (slave_config->dst_addr)
                                 pch->fifo_addr = slave_config->dst_addr;
                         if (slave_config->dst_addr_width)
                                 pch->burst_sz = __ffs(slave_config->dst_addr_width);
                         if (slave_config->dst_maxburst)
                                 pch->burst_len = slave_config->dst_maxburst;
-                } else if (slave_config->direction == DMA_FROM_DEVICE) {
+                } else if (slave_config->direction == DMA_DEV_TO_MEM) {
                         if (slave_config->src_addr)
                                 pch->fifo_addr = slave_config->src_addr;
                         if (slave_config->src_addr_width)
@@ -597,7 +597,7 @@ static inline int get_burst_len(struct dma_pl330_desc *desc, size_t len)
 
 static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(
                 struct dma_chan *chan, dma_addr_t dma_addr, size_t len,
-                size_t period_len, enum dma_data_direction direction)
+                size_t period_len, enum dma_transfer_direction direction)
 {
         struct dma_pl330_desc *desc;
         struct dma_pl330_chan *pch = to_pchan(chan);
@@ -612,13 +612,13 @@ static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(
         }
 
         switch (direction) {
-        case DMA_TO_DEVICE:
+        case DMA_MEM_TO_DEV:
                 desc->rqcfg.src_inc = 1;
                 desc->rqcfg.dst_inc = 0;
                 src = dma_addr;
                 dst = pch->fifo_addr;
                 break;
-        case DMA_FROM_DEVICE:
+        case DMA_DEV_TO_MEM:
                 desc->rqcfg.src_inc = 0;
                 desc->rqcfg.dst_inc = 1;
                 src = pch->fifo_addr;
@@ -687,7 +687,7 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,
 
 static struct dma_async_tx_descriptor *
 pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
-                unsigned int sg_len, enum dma_data_direction direction,
+                unsigned int sg_len, enum dma_transfer_direction direction,
                 unsigned long flg)
 {
         struct dma_pl330_desc *first, *desc = NULL;
@@ -702,9 +702,9 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                 return NULL;
 
         /* Make sure the direction is consistent */
-        if ((direction == DMA_TO_DEVICE &&
+        if ((direction == DMA_MEM_TO_DEV &&
                                 peri->rqtype != MEMTODEV) ||
-                        (direction == DMA_FROM_DEVICE &&
+                        (direction == DMA_DEV_TO_MEM &&
                                 peri->rqtype != DEVTOMEM)) {
                 dev_err(pch->dmac->pif.dev, "%s:%d Invalid Direction\n",
                                 __func__, __LINE__);
@@ -747,7 +747,7 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                 else
                         list_add_tail(&desc->node, &first->node);
 
-                if (direction == DMA_TO_DEVICE) {
+                if (direction == DMA_MEM_TO_DEV) {
                         desc->rqcfg.src_inc = 1;
                         desc->rqcfg.dst_inc = 0;
                         fill_px(&desc->px,