Merge branch 'dma_slave_direction' into next_test_dirn

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

4 files changed, 16 insertions, 13 deletions

diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c
index e743a45ee92c..8418eb036651 100644
--- a/drivers/spi/spi-dw-mid.c
+++ b/drivers/spi/spi-dw-mid.c
@@ -131,7 +131,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
         rxchan = dws->rxchan;
 
         /* 2. Prepare the TX dma transfer */
-        txconf.direction = DMA_TO_DEVICE;
+        txconf.direction = DMA_MEM_TO_DEV;
         txconf.dst_addr = dws->dma_addr;
         txconf.dst_maxburst = LNW_DMA_MSIZE_16;
         txconf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
@@ -147,13 +147,13 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
         txdesc = txchan->device->device_prep_slave_sg(txchan,
                                 &dws->tx_sgl,
                                 1,
-                                DMA_TO_DEVICE,
+                                DMA_MEM_TO_DEV,
                                 DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_DEST_UNMAP);
         txdesc->callback = dw_spi_dma_done;
         txdesc->callback_param = dws;
 
         /* 3. Prepare the RX dma transfer */
-        rxconf.direction = DMA_FROM_DEVICE;
+        rxconf.direction = DMA_DEV_TO_MEM;
         rxconf.src_addr = dws->dma_addr;
         rxconf.src_maxburst = LNW_DMA_MSIZE_16;
         rxconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
@@ -169,7 +169,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
         rxdesc = rxchan->device->device_prep_slave_sg(rxchan,
                                 &dws->rx_sgl,
                                 1,
-                                DMA_FROM_DEVICE,
+                                DMA_DEV_TO_MEM,
                                 DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_DEST_UNMAP);
         rxdesc->callback = dw_spi_dma_done;
         rxdesc->callback_param = dws;
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index 0a282e5fcc9c..d46e55c720b7 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -551,6 +551,7 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)
         struct dma_async_tx_descriptor *txd;
         enum dma_slave_buswidth buswidth;
         struct dma_slave_config conf;
+        enum dma_transfer_direction slave_dirn;
         struct scatterlist *sg;
         struct sg_table *sgt;
         struct dma_chan *chan;
@@ -573,6 +574,7 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)
 
                 conf.src_addr = espi->sspdr_phys;
                 conf.src_addr_width = buswidth;
+                slave_dirn = DMA_DEV_TO_MEM;
         } else {
                 chan = espi->dma_tx;
                 buf = t->tx_buf;
@@ -580,6 +582,7 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)
 
                 conf.dst_addr = espi->sspdr_phys;
                 conf.dst_addr_width = buswidth;
+                slave_dirn = DMA_MEM_TO_DEV;
         }
 
         ret = dmaengine_slave_config(chan, &conf);
@@ -631,7 +634,7 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)
                 return ERR_PTR(-ENOMEM);
 
         txd = chan->device->device_prep_slave_sg(chan, sgt->sgl, nents,
-                                                 dir, DMA_CTRL_ACK);
+                                                 slave_dirn, DMA_CTRL_ACK);
         if (!txd) {
                 dma_unmap_sg(chan->device->dev, sgt->sgl, sgt->nents, dir);
                 return ERR_PTR(-ENOMEM);
@@ -979,7 +982,7 @@ static int ep93xx_spi_setup_dma(struct ep93xx_spi *espi)
         dma_cap_set(DMA_SLAVE, mask);
 
         espi->dma_rx_data.port = EP93XX_DMA_SSP;
-        espi->dma_rx_data.direction = DMA_FROM_DEVICE;
+        espi->dma_rx_data.direction = DMA_DEV_TO_MEM;
         espi->dma_rx_data.name = "ep93xx-spi-rx";
 
         espi->dma_rx = dma_request_channel(mask, ep93xx_spi_dma_filter,
@@ -990,7 +993,7 @@ static int ep93xx_spi_setup_dma(struct ep93xx_spi *espi)
         }
 
         espi->dma_tx_data.port = EP93XX_DMA_SSP;
-        espi->dma_tx_data.direction = DMA_TO_DEVICE;
+        espi->dma_tx_data.direction = DMA_MEM_TO_DEV;
         espi->dma_tx_data.name = "ep93xx-spi-tx";
 
         espi->dma_tx = dma_request_channel(mask, ep93xx_spi_dma_filter,
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index f103e470cb63..95400fa99d90 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -904,11 +904,11 @@ static int configure_dma(struct pl022 *pl022)
 {
         struct dma_slave_config rx_conf = {
                 .src_addr = SSP_DR(pl022->phybase),
-                .direction = DMA_FROM_DEVICE,
+                .direction = DMA_DEV_TO_MEM,
         };
         struct dma_slave_config tx_conf = {
                 .dst_addr = SSP_DR(pl022->phybase),
-                .direction = DMA_TO_DEVICE,
+                .direction = DMA_MEM_TO_DEV,
         };
         unsigned int pages;
         int ret;
@@ -1045,7 +1045,7 @@ static int configure_dma(struct pl022 *pl022)
         rxdesc = rxchan->device->device_prep_slave_sg(rxchan,
                                       pl022->sgt_rx.sgl,
                                       rx_sglen,
-                                      DMA_FROM_DEVICE,
+                                      DMA_DEV_TO_MEM,
                                       DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!rxdesc)
                 goto err_rxdesc;
@@ -1053,7 +1053,7 @@ static int configure_dma(struct pl022 *pl022)
         txdesc = txchan->device->device_prep_slave_sg(txchan,
                                       pl022->sgt_tx.sgl,
                                       tx_sglen,
-                                      DMA_TO_DEVICE,
+                                      DMA_MEM_TO_DEV,
                                       DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!txdesc)
                 goto err_txdesc;
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 6a80749391db..99ec279bc46d 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1076,7 +1076,7 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw)
         }
         sg = dma->sg_rx_p;
         desc_rx = dma->chan_rx->device->device_prep_slave_sg(dma->chan_rx, sg,
-                                        num, DMA_FROM_DEVICE,
+                                        num, DMA_DEV_TO_MEM,
                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc_rx) {
                 dev_err(&data->master->dev, "%s:device_prep_slave_sg Failed\n",
@@ -1121,7 +1121,7 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw)
         }
         sg = dma->sg_tx_p;
         desc_tx = dma->chan_tx->device->device_prep_slave_sg(dma->chan_tx,
-                                        sg, num, DMA_TO_DEVICE,
+                                        sg, num, DMA_MEM_TO_DEV,
                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc_tx) {
                 dev_err(&data->master->dev, "%s:device_prep_slave_sg Failed\n",