Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
  ARM: mach-shmobile: specify CHCLR registers on SH7372
  dma: shdma: fix runtime PM: clear channel buffers on reset
  dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
  dmaengine/ste_dma40: clear LNK on channel startup
  dmaengine: intel_mid_dma: remove legacy pm interface
  ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
  dmaengine: intel_mid_dma: error path fix
  dmaengine: intel_mid_dma: locking and freeing fixes
  mtd: gpmi-nand: move to dma_transfer_direction
  mtd: fix compile error for gpmi-nand
  mmc: mxs-mmc: fix the dma_transfer_direction migration
  dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
  dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
  dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
  dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
  dma: mxs-dma: fix a typo in comment
  DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
  video i.MX IPU: Fix display connections
  i.MX IPU DMA: Fix wrong burstsize settings
  dmaengine/ste_dma40: allow fixed physical channel
  ...

Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

The conflicts looked pretty trivial, but I'll ask people to verify them.

6 files changed, 34 insertions, 15 deletions

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index a7ee50271465..fcfe1eb5acc8 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -823,6 +823,7 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)
         struct scatterlist              *sg;
         unsigned int                    i;
         enum dma_data_direction         direction;
+        enum dma_transfer_direction     slave_dirn;
         unsigned int                    sglen;
         u32 iflags;
 
@@ -860,16 +861,19 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)
         if (host->caps.has_dma)
                 atmci_writel(host, ATMCI_DMA, ATMCI_DMA_CHKSIZE(3) | ATMCI_DMAEN);
 
-        if (data->flags & MMC_DATA_READ)
+        if (data->flags & MMC_DATA_READ) {
                 direction = DMA_FROM_DEVICE;
-        else
+                slave_dirn = DMA_DEV_TO_MEM;
+        } else {
                 direction = DMA_TO_DEVICE;
+                slave_dirn = DMA_MEM_TO_DEV;
+        }
 
         sglen = dma_map_sg(chan->device->dev, data->sg,
                         data->sg_len, direction);
 
         desc = chan->device->device_prep_slave_sg(chan,
-                        data->sg, sglen, direction,
+                        data->sg, sglen, slave_dirn,
                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc)
                 goto unmap_exit;
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index ece03b491c7d..0d955ffaf44e 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -374,6 +374,7 @@ static int mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,
         struct dma_chan *chan;
         struct dma_device *device;
         struct dma_async_tx_descriptor *desc;
+        enum dma_data_direction buffer_dirn;
         int nr_sg;
 
         /* Check if next job is already prepared */
@@ -387,10 +388,12 @@ static int mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,
         }
 
         if (data->flags & MMC_DATA_READ) {
-                conf.direction = DMA_FROM_DEVICE;
+                conf.direction = DMA_DEV_TO_MEM;
+                buffer_dirn = DMA_FROM_DEVICE;
                 chan = host->dma_rx_channel;
         } else {
-                conf.direction = DMA_TO_DEVICE;
+                conf.direction = DMA_MEM_TO_DEV;
+                buffer_dirn = DMA_TO_DEVICE;
                 chan = host->dma_tx_channel;
         }
 
@@ -403,7 +406,7 @@ static int mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,
                 return -EINVAL;
 
         device = chan->device;
-        nr_sg = dma_map_sg(device->dev, data->sg, data->sg_len, conf.direction);
+        nr_sg = dma_map_sg(device->dev, data->sg, data->sg_len, buffer_dirn);
         if (nr_sg == 0)
                 return -EINVAL;
 
@@ -426,7 +429,7 @@ static int mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,
  unmap_exit:
         if (!next)
                 dmaengine_terminate_all(chan);
-        dma_unmap_sg(device->dev, data->sg, data->sg_len, conf.direction);
+        dma_unmap_sg(device->dev, data->sg, data->sg_len, buffer_dirn);
         return -ENOMEM;
 }
 
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index 7088b40f9579..4184b7946bbf 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -218,6 +218,7 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
         unsigned int blksz = data->blksz;
         unsigned int datasize = nob * blksz;
         struct scatterlist *sg;
+        enum dma_transfer_direction slave_dirn;
         int i, nents;
 
         if (data->flags & MMC_DATA_STREAM)
@@ -240,10 +241,13 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
                 }
         }
 
-        if (data->flags & MMC_DATA_READ)
+        if (data->flags & MMC_DATA_READ) {
                 host->dma_dir = DMA_FROM_DEVICE;
-        else
+                slave_dirn = DMA_DEV_TO_MEM;
+        } else {
                 host->dma_dir = DMA_TO_DEVICE;
+                slave_dirn = DMA_MEM_TO_DEV;
+        }
 
         nents = dma_map_sg(host->dma->device->dev, data->sg,
                                      data->sg_len,  host->dma_dir);
@@ -251,7 +255,7 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
                 return -EINVAL;
 
         host->desc = host->dma->device->device_prep_slave_sg(host->dma,
-                data->sg, data->sg_len, host->dma_dir,
+                data->sg, data->sg_len, slave_dirn,
                 DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 
         if (!host->desc) {
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 4e2e019dd5c9..382c835d217c 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -154,6 +154,7 @@ struct mxs_mmc_host {
         struct dma_chan                 *dmach;
         struct mxs_dma_data             dma_data;
         unsigned int                    dma_dir;
+        enum dma_transfer_direction     slave_dirn;
         u32                             ssp_pio_words[SSP_PIO_NUM];
 
         unsigned int                    version;
@@ -324,7 +325,7 @@ static struct dma_async_tx_descriptor *mxs_mmc_prep_dma(
         }
 
         desc = host->dmach->device->device_prep_slave_sg(host->dmach,
-                                sgl, sg_len, host->dma_dir, append);
+                                sgl, sg_len, host->slave_dirn, append);
         if (desc) {
                 desc->callback = mxs_mmc_dma_irq_callback;
                 desc->callback_param = host;
@@ -356,6 +357,7 @@ static void mxs_mmc_bc(struct mxs_mmc_host *host)
         host->ssp_pio_words[1] = cmd0;
         host->ssp_pio_words[2] = cmd1;
         host->dma_dir = DMA_NONE;
+        host->slave_dirn = DMA_TRANS_NONE;
         desc = mxs_mmc_prep_dma(host, 0);
         if (!desc)
                 goto out;
@@ -395,6 +397,7 @@ static void mxs_mmc_ac(struct mxs_mmc_host *host)
         host->ssp_pio_words[1] = cmd0;
         host->ssp_pio_words[2] = cmd1;
         host->dma_dir = DMA_NONE;
+        host->slave_dirn = DMA_TRANS_NONE;
         desc = mxs_mmc_prep_dma(host, 0);
         if (!desc)
                 goto out;
@@ -433,6 +436,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
         int i;
 
         unsigned short dma_data_dir, timeout;
+        enum dma_transfer_direction slave_dirn;
         unsigned int data_size = 0, log2_blksz;
         unsigned int blocks = data->blocks;
 
@@ -448,9 +452,11 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
 
         if (data->flags & MMC_DATA_WRITE) {
                 dma_data_dir = DMA_TO_DEVICE;
+                slave_dirn = DMA_MEM_TO_DEV;
                 read = 0;
         } else {
                 dma_data_dir = DMA_FROM_DEVICE;
+                slave_dirn = DMA_DEV_TO_MEM;
                 read = BM_SSP_CTRL0_READ;
         }
 
@@ -510,6 +516,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
         host->ssp_pio_words[1] = cmd0;
         host->ssp_pio_words[2] = cmd1;
         host->dma_dir = DMA_NONE;
+        host->slave_dirn = DMA_TRANS_NONE;
         desc = mxs_mmc_prep_dma(host, 0);
         if (!desc)
                 goto out;
@@ -518,6 +525,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
         WARN_ON(host->data != NULL);
         host->data = data;
         host->dma_dir = dma_data_dir;
+        host->slave_dirn = slave_dirn;
         desc = mxs_mmc_prep_dma(host, 1);
         if (!desc)
                 goto out;
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 4a2c5b2355f2..f5d8b53be333 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -286,7 +286,7 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)
         if (ret > 0) {
                 host->dma_active = true;
                 desc = chan->device->device_prep_slave_sg(chan, sg, ret,
-                        DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+                        DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         }
 
         if (desc) {
@@ -335,7 +335,7 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)
         if (ret > 0) {
                 host->dma_active = true;
                 desc = chan->device->device_prep_slave_sg(chan, sg, ret,
-                        DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+                        DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         }
 
         if (desc) {
diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c
index 86f259cdfcbc..7a6e6cc8f8b8 100644
--- a/drivers/mmc/host/tmio_mmc_dma.c
+++ b/drivers/mmc/host/tmio_mmc_dma.c
@@ -77,7 +77,7 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)
         ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_FROM_DEVICE);
         if (ret > 0)
                 desc = chan->device->device_prep_slave_sg(chan, sg, ret,
-                        DMA_FROM_DEVICE, DMA_CTRL_ACK);
+                        DMA_DEV_TO_MEM, DMA_CTRL_ACK);
 
         if (desc) {
                 cookie = dmaengine_submit(desc);
@@ -158,7 +158,7 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)
         ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_TO_DEVICE);
         if (ret > 0)
                 desc = chan->device->device_prep_slave_sg(chan, sg, ret,
-                        DMA_TO_DEVICE, DMA_CTRL_ACK);
+                        DMA_MEM_TO_DEV, DMA_CTRL_ACK);
 
         if (desc) {
                 cookie = dmaengine_submit(desc);