Merge branch 'dma_slave_direction' into next_test_dirn

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

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index ef4333f4bbe0..f8fd0ddee14a 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -112,7 +112,7 @@ static bool ux500_configure_channel(struct dma_channel *channel,
         struct musb_hw_ep *hw_ep = ux500_channel->hw_ep;
         struct dma_chan *dma_chan = ux500_channel->dma_chan;
         struct dma_async_tx_descriptor *dma_desc;
-        enum dma_data_direction direction;
+        enum dma_transfer_direction direction;
         struct scatterlist sg;
         struct dma_slave_config slave_conf;
         enum dma_slave_buswidth addr_width;
@@ -132,7 +132,7 @@ static bool ux500_configure_channel(struct dma_channel *channel,
         sg_dma_address(&sg) = dma_addr;
         sg_dma_len(&sg) = len;
 
-        direction = ux500_channel->is_tx ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
+        direction = ux500_channel->is_tx ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
         addr_width = (len & 0x3) ? DMA_SLAVE_BUSWIDTH_1_BYTE :
                                         DMA_SLAVE_BUSWIDTH_4_BYTES;
 
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index 8da685e796d1..e2f22d4b8c3a 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -765,10 +765,10 @@ static void usbhsf_dma_prepare_tasklet(unsigned long data)
         struct dma_async_tx_descriptor *desc;
         struct dma_chan *chan = usbhsf_dma_chan_get(fifo, pkt);
         struct device *dev = usbhs_priv_to_dev(priv);
-        enum dma_data_direction dir;
+        enum dma_transfer_direction dir;
         dma_cookie_t cookie;
 
-        dir = usbhs_pipe_is_dir_in(pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
+        dir = usbhs_pipe_is_dir_in(pipe) ? DMA_DEV_TO_MEM : DMA_MEM_TO_DEV;
 
         sg_init_table(&sg, 1);
         sg_set_page(&sg, virt_to_page(pkt->dma),