Merge branch 'dma_slave_direction' into next_test_dirn

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

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index f993955a640c..2e0357178d19 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -247,7 +247,7 @@ struct sdma_engine;
 struct sdma_channel {
         struct sdma_engine              *sdma;
         unsigned int                    channel;
-        enum dma_data_direction         direction;
+        enum dma_transfer_direction             direction;
         enum sdma_peripheral_type       peripheral_type;
         unsigned int                    event_id0;
         unsigned int                    event_id1;
@@ -650,7 +650,7 @@ static int sdma_load_context(struct sdma_channel *sdmac)
         struct sdma_buffer_descriptor *bd0 = sdma->channel[0].bd;
         int ret;
 
-        if (sdmac->direction == DMA_FROM_DEVICE) {
+        if (sdmac->direction == DMA_DEV_TO_MEM) {
                 load_address = sdmac->pc_from_device;
         } else {
                 load_address = sdmac->pc_to_device;
@@ -911,7 +911,7 @@ static void sdma_free_chan_resources(struct dma_chan *chan)
 
 static struct dma_async_tx_descriptor *sdma_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 flags)
 {
         struct sdma_channel *sdmac = to_sdma_chan(chan);
@@ -1008,7 +1008,7 @@ err_out:
 
 static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
                 struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
-                size_t period_len, enum dma_data_direction direction)
+                size_t period_len, enum dma_transfer_direction direction)
 {
         struct sdma_channel *sdmac = to_sdma_chan(chan);
         struct sdma_engine *sdma = sdmac->sdma;
@@ -1093,7 +1093,7 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                 sdma_disable_channel(sdmac);
                 return 0;
         case DMA_SLAVE_CONFIG:
-                if (dmaengine_cfg->direction == DMA_FROM_DEVICE) {
+                if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) {
                         sdmac->per_address = dmaengine_cfg->src_addr;
                         sdmac->watermark_level = dmaengine_cfg->src_maxburst;
                         sdmac->word_size = dmaengine_cfg->src_addr_width;