Merge branch 'dma_slave_direction' into next_test_dirn

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

4 files changed, 21 insertions, 9 deletions

diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h
index 9eabffbc4e50..033f6aa670de 100644
--- a/include/linux/amba/pl08x.h
+++ b/include/linux/amba/pl08x.h
@@ -134,7 +134,7 @@ struct pl08x_txd {
         struct dma_async_tx_descriptor tx;
         struct list_head node;
         struct list_head dsg_list;
-        enum dma_data_direction direction;
+        enum dma_transfer_direction direction;
         dma_addr_t llis_bus;
         struct pl08x_lli *llis_va;
         /* Default cctl value for LLIs */
@@ -197,7 +197,7 @@ struct pl08x_dma_chan {
         dma_addr_t dst_addr;
         u32 src_cctl;
         u32 dst_cctl;
-        enum dma_data_direction runtime_direction;
+        enum dma_transfer_direction runtime_direction;
         dma_cookie_t lc;
         struct list_head pend_list;
         struct pl08x_txd *at;
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 75f53f874b24..a865b3a354cd 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -23,7 +23,6 @@
 
 #include <linux/device.h>
 #include <linux/uio.h>
-#include <linux/dma-direction.h>
 #include <linux/scatterlist.h>
 #include <linux/bitmap.h>
 #include <asm/page.h>
@@ -77,6 +76,19 @@ enum dma_transaction_type {
 /* last transaction type for creation of the capabilities mask */
 #define DMA_TX_TYPE_END (DMA_CYCLIC + 1)
 
+/**
+ * enum dma_transfer_direction - dma transfer mode and direction indicator
+ * @DMA_MEM_TO_MEM: Async/Memcpy mode
+ * @DMA_MEM_TO_DEV: Slave mode & From Memory to Device
+ * @DMA_DEV_TO_MEM: Slave mode & From Device to Memory
+ * @DMA_DEV_TO_DEV: Slave mode & From Device to Device
+ */
+enum dma_transfer_direction {
+        DMA_MEM_TO_MEM,
+        DMA_MEM_TO_DEV,
+        DMA_DEV_TO_MEM,
+        DMA_DEV_TO_DEV,
+};
 
 /**
  * enum dma_ctrl_flags - DMA flags to augment operation preparation,
@@ -269,7 +281,7 @@ enum dma_slave_buswidth {
  * struct, if applicable.
  */
 struct dma_slave_config {
-        enum dma_data_direction direction;
+        enum dma_transfer_direction direction;
         dma_addr_t src_addr;
         dma_addr_t dst_addr;
         enum dma_slave_buswidth src_addr_width;
@@ -492,11 +504,11 @@ struct dma_device {
 
         struct dma_async_tx_descriptor *(*device_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 dma_async_tx_descriptor *(*device_prep_dma_cyclic)(
                 struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
-                size_t period_len, enum dma_data_direction direction);
+                size_t period_len, enum dma_transfer_direction direction);
         int (*device_control)(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                 unsigned long arg);
 
@@ -522,7 +534,7 @@ static inline int dmaengine_slave_config(struct dma_chan *chan,
 
 static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single(
         struct dma_chan *chan, void *buf, size_t len,
-        enum dma_data_direction dir, unsigned long flags)
+        enum dma_transfer_direction dir, unsigned long flags)
 {
         struct scatterlist sg;
         sg_init_one(&sg, buf, len);
diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h
index 4bfe0a2f7d50..f2c64f92c4a0 100644
--- a/include/linux/dw_dmac.h
+++ b/include/linux/dw_dmac.h
@@ -127,7 +127,7 @@ struct dw_cyclic_desc {
 
 struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
                 dma_addr_t buf_addr, size_t buf_len, size_t period_len,
-                enum dma_data_direction direction);
+                enum dma_transfer_direction direction);
 void dw_dma_cyclic_free(struct dma_chan *chan);
 int dw_dma_cyclic_start(struct dma_chan *chan);
 void dw_dma_cyclic_stop(struct dma_chan *chan);
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index cb2dd118cc0f..62ef6938da10 100644
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -30,7 +30,7 @@ struct sh_desc {
         struct sh_dmae_regs hw;
         struct list_head node;
         struct dma_async_tx_descriptor async_tx;
-        enum dma_data_direction direction;
+        enum dma_transfer_direction direction;
         dma_cookie_t cookie;
         size_t partial;
         int chunks;