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.

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-shmobile/setup-sh7372.c
Simple merge

diff --cc arch/arm/plat-samsung/dma-ops.c
index 2cded872f22b3debd634282a408d67169ceff981,1baa8ce824324e92c63258629378b500fbc5bf1a..0747c77a2fd53d0d2a66a1f1f2377b3d7e7722f6
--- 1/arch/arm/plat-samsung/dma-ops.c
--- 2/arch/arm/plat-samsung/dma-ops.c
+++ b/arch/arm/plat-samsung/dma-ops.c
@@@ -29,15 -34,9 +29,15 @@@ static unsigned samsung_dmadev_request(
        dma_cap_zero(mask);
        dma_cap_set(info->cap, mask);
  
 -      chan = dma_request_channel(mask, pl330_filter, (void *)dma_ch);
 +      /*
 +       * If a dma channel property of a device node from device tree is
 +       * specified, use that as the fliter parameter.
 +       */
 +      filter_param = (dma_ch == DMACH_DT_PROP) ? (void *)info->dt_dmach_prop :
 +                              (void *)dma_ch;
 +      chan = dma_request_channel(mask, pl330_filter, filter_param);
  
-       if (info->direction == DMA_FROM_DEVICE) {
+       if (info->direction == DMA_DEV_TO_MEM) {
                memset(&slave_config, 0, sizeof(struct dma_slave_config));
                slave_config.direction = info->direction;
                slave_config.src_addr = info->fifo;

diff --cc arch/arm/plat-samsung/include/plat/dma-ops.h
Simple merge

diff --cc drivers/dma/amba-pl08x.c
Simple merge

diff --cc drivers/dma/mxs-dma.c
index fc903c0ed234eae754d06911b94f73f463a3b7eb,493af2f6e33a44ac9e5153050cae7848cfab1181..b06cd4ca626fb4fd93d5ab3b7fedddbfd6ea6c25
--- 1/drivers/dma/mxs-dma.c
--- 2/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@@ -578,9 -554,9 +554,9 @@@ static int __init mxs_dma_init(struct m
  {
        int ret;
  
 -      ret = clk_enable(mxs_dma->clk);
 +      ret = clk_prepare_enable(mxs_dma->clk);
        if (ret)
-               goto err_out;
+               return ret;
  
        ret = mxs_reset_block(mxs_dma->base);
        if (ret)
@@@ -604,11 -580,8 +580,8 @@@
        writel(MXS_DMA_CHANNELS_MASK << MXS_DMA_CHANNELS,
                mxs_dma->base + HW_APBHX_CTRL1 + MXS_SET_ADDR);
  
-       clk_disable_unprepare(mxs_dma->clk);
- 
-       return 0;
- 
  err_out:
 -      clk_disable(mxs_dma->clk);
++      clk_disable_unprepare(mxs_dma->clk);
        return ret;
  }
  

diff --cc drivers/dma/pl330.c
index 09adcfcd953e6841e840fb9caa663212c20c03f7,a5737575d23681680bd19ff5f24ee017a95239e2..b8ec03ee8e22e495e633ff95bf9faf0d02756dac
--- 1/drivers/dma/pl330.c
--- 2/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@@ -636,17 -612,15 +636,17 @@@ static struct dma_async_tx_descriptor *
        }
  
        switch (direction) {
-       case DMA_TO_DEVICE:
+       case DMA_MEM_TO_DEV:
                desc->rqcfg.src_inc = 1;
                desc->rqcfg.dst_inc = 0;
 +              desc->req.rqtype = MEMTODEV;
                src = dma_addr;
                dst = pch->fifo_addr;
                break;
-       case DMA_FROM_DEVICE:
+       case DMA_DEV_TO_MEM:
                desc->rqcfg.src_inc = 0;
                desc->rqcfg.dst_inc = 1;
 +              desc->req.rqtype = DEVTOMEM;
                src = pch->fifo_addr;
                dst = dma_addr;
                break;
@@@ -759,10 -747,9 +759,10 @@@ pl330_prep_slave_sg(struct dma_chan *ch
                else
                        list_add_tail(&desc->node, &first->node);
  
-               if (direction == DMA_TO_DEVICE) {
+               if (direction == DMA_MEM_TO_DEV) {
                        desc->rqcfg.src_inc = 1;
                        desc->rqcfg.dst_inc = 0;
 +                      desc->req.rqtype = MEMTODEV;
                        fill_px(&desc->px,
                                addr, sg_dma_address(sg), sg_dma_len(sg));
                } else {

diff --cc drivers/media/video/mx3_camera.c
Simple merge

diff --cc drivers/media/video/timblogiw.c
Simple merge

diff --cc drivers/misc/carma/carma-fpga-program.c
Simple merge

diff --cc drivers/mmc/host/mmci.c
Simple merge

diff --cc drivers/mmc/host/mxcmmc.c
Simple merge

diff --cc drivers/mmc/host/mxs-mmc.c
Simple merge

diff --cc drivers/mmc/host/sh_mmcif.c
Simple merge

diff --cc drivers/mtd/nand/gpmi-nand/gpmi-lib.c
Simple merge

diff --cc drivers/net/ethernet/micrel/ks8842.c
Simple merge

diff --cc drivers/spi/spi-pl022.c
Simple merge

diff --cc drivers/spi/spi-topcliff-pch.c
Simple merge

diff --cc drivers/tty/serial/amba-pl011.c
Simple merge

diff --cc drivers/tty/serial/pch_uart.c
Simple merge

diff --cc drivers/tty/serial/sh-sci.c
Simple merge

diff --cc drivers/usb/musb/ux500_dma.c
Simple merge

diff --cc drivers/usb/renesas_usbhs/fifo.c
Simple merge

diff --cc sound/atmel/ac97c.c
Simple merge

diff --cc sound/soc/ep93xx/ep93xx-pcm.c
Simple merge

diff --cc sound/soc/imx/imx-pcm-dma-mx2.c
Simple merge

diff --cc sound/soc/mxs/mxs-pcm.c
Simple merge

diff --cc sound/soc/samsung/dma.c
Simple merge

diff --cc sound/soc/txx9/txx9aclc.c
Simple merge