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, 3 deletions

diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 1ea89be63e29..6fcf304d3cdf 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -445,31 +445,39 @@ static const struct sh_dmae_slave_config sh7372_dmae_slaves[] = {
         },
 };
 
+#define SH7372_CHCLR 0x220
+
 static const struct sh_dmae_channel sh7372_dmae_channels[] = {
         {
                 .offset = 0,
                 .dmars = 0,
                 .dmars_bit = 0,
+                .chclr_offset = SH7372_CHCLR + 0,
         }, {
                 .offset = 0x10,
                 .dmars = 0,
                 .dmars_bit = 8,
+                .chclr_offset = SH7372_CHCLR + 0x10,
         }, {
                 .offset = 0x20,
                 .dmars = 4,
                 .dmars_bit = 0,
+                .chclr_offset = SH7372_CHCLR + 0x20,
         }, {
                 .offset = 0x30,
                 .dmars = 4,
                 .dmars_bit = 8,
+                .chclr_offset = SH7372_CHCLR + 0x30,
         }, {
                 .offset = 0x50,
                 .dmars = 8,
                 .dmars_bit = 0,
+                .chclr_offset = SH7372_CHCLR + 0x50,
         }, {
                 .offset = 0x60,
                 .dmars = 8,
                 .dmars_bit = 8,
+                .chclr_offset = SH7372_CHCLR + 0x60,
         }
 };
 
@@ -487,6 +495,7 @@ static struct sh_dmae_pdata dma_platform_data = {
         .ts_shift       = ts_shift,
         .ts_shift_num   = ARRAY_SIZE(ts_shift),
         .dmaor_init     = DMAOR_DME,
+        .chclr_present  = 1,
 };
 
 /* Resource order important! */
@@ -494,7 +503,7 @@ static struct resource sh7372_dmae0_resources[] = {
         {
                 /* Channel registers and DMAOR */
                 .start  = 0xfe008020,
-                .end    = 0xfe00808f,
+                .end    = 0xfe00828f,
                 .flags  = IORESOURCE_MEM,
         },
         {
@@ -522,7 +531,7 @@ static struct resource sh7372_dmae1_resources[] = {
         {
                 /* Channel registers and DMAOR */
                 .start  = 0xfe018020,
-                .end    = 0xfe01808f,
+                .end    = 0xfe01828f,
                 .flags  = IORESOURCE_MEM,
         },
         {
@@ -550,7 +559,7 @@ static struct resource sh7372_dmae2_resources[] = {
         {
                 /* Channel registers and DMAOR */
                 .start  = 0xfe028020,
-                .end    = 0xfe02808f,
+                .end    = 0xfe02828f,
                 .flags  = IORESOURCE_MEM,
         },
         {