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.

1 files changed, 12 insertions, 10 deletions

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index 2a56fc6f399..7f680420bfa 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@ -827,7 +827,7 @@ int gpmi_send_command(struct gpmi_nand_data *this)
         pio[1] = pio[2] = 0;
         desc = channel->device->device_prep_slave_sg(channel,
                                         (struct scatterlist *)pio,
-                                        ARRAY_SIZE(pio), DMA_NONE, 0);
+                                        ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
         if (!desc) {
                 pr_err("step 1 error\n");
                 return -1;
@@ -839,7 +839,7 @@ int gpmi_send_command(struct gpmi_nand_data *this)
         sg_init_one(sgl, this->cmd_buffer, this->command_length);
         dma_map_sg(this->dev, sgl, 1, DMA_TO_DEVICE);
         desc = channel->device->device_prep_slave_sg(channel,
-                                        sgl, 1, DMA_TO_DEVICE, 1);
+                                        sgl, 1, DMA_MEM_TO_DEV, 1);
         if (!desc) {
                 pr_err("step 2 error\n");
                 return -1;
@@ -872,7 +872,7 @@ int gpmi_send_data(struct gpmi_nand_data *this)
         pio[1] = 0;
         desc = channel->device->device_prep_slave_sg(channel,
                                         (struct scatterlist *)pio,
-                                        ARRAY_SIZE(pio), DMA_NONE, 0);
+                                        ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
         if (!desc) {
                 pr_err("step 1 error\n");
                 return -1;
@@ -881,7 +881,7 @@ int gpmi_send_data(struct gpmi_nand_data *this)
         /* [2] send DMA request */
         prepare_data_dma(this, DMA_TO_DEVICE);
         desc = channel->device->device_prep_slave_sg(channel, &this->data_sgl,
-                                                1, DMA_TO_DEVICE, 1);
+                                                1, DMA_MEM_TO_DEV, 1);
         if (!desc) {
                 pr_err("step 2 error\n");
                 return -1;
@@ -908,7 +908,7 @@ int gpmi_read_data(struct gpmi_nand_data *this)
         pio[1] = 0;
         desc = channel->device->device_prep_slave_sg(channel,
                                         (struct scatterlist *)pio,
-                                        ARRAY_SIZE(pio), DMA_NONE, 0);
+                                        ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
         if (!desc) {
                 pr_err("step 1 error\n");
                 return -1;
@@ -917,7 +917,7 @@ int gpmi_read_data(struct gpmi_nand_data *this)
         /* [2] : send DMA request */
         prepare_data_dma(this, DMA_FROM_DEVICE);
         desc = channel->device->device_prep_slave_sg(channel, &this->data_sgl,
-                                                1, DMA_FROM_DEVICE, 1);
+                                                1, DMA_DEV_TO_MEM, 1);
         if (!desc) {
                 pr_err("step 2 error\n");
                 return -1;
@@ -964,7 +964,7 @@ int gpmi_send_page(struct gpmi_nand_data *this,
 
         desc = channel->device->device_prep_slave_sg(channel,
                                         (struct scatterlist *)pio,
-                                        ARRAY_SIZE(pio), DMA_NONE, 0);
+                                        ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
         if (!desc) {
                 pr_err("step 2 error\n");
                 return -1;
@@ -998,7 +998,8 @@ int gpmi_read_page(struct gpmi_nand_data *this,
                 | BF_GPMI_CTRL0_XFER_COUNT(0);
         pio[1] = 0;
         desc = channel->device->device_prep_slave_sg(channel,
-                                (struct scatterlist *)pio, 2, DMA_NONE, 0);
+                                (struct scatterlist *)pio, 2,
+                                DMA_TRANS_NONE, 0);
         if (!desc) {
                 pr_err("step 1 error\n");
                 return -1;
@@ -1027,7 +1028,7 @@ int gpmi_read_page(struct gpmi_nand_data *this,
         pio[5] = auxiliary;
         desc = channel->device->device_prep_slave_sg(channel,
                                         (struct scatterlist *)pio,
-                                        ARRAY_SIZE(pio), DMA_NONE, 1);
+                                        ARRAY_SIZE(pio), DMA_TRANS_NONE, 1);
         if (!desc) {
                 pr_err("step 2 error\n");
                 return -1;
@@ -1045,7 +1046,8 @@ int gpmi_read_page(struct gpmi_nand_data *this,
                 | BF_GPMI_CTRL0_XFER_COUNT(geo->page_size);
         pio[1] = 0;
         desc = channel->device->device_prep_slave_sg(channel,
-                                (struct scatterlist *)pio, 2, DMA_NONE, 1);
+                                (struct scatterlist *)pio, 2,
+                                DMA_TRANS_NONE, 1);
         if (!desc) {
                 pr_err("step 3 error\n");
                 return -1;