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

Pull slave-dmaengine updates from Vinod Koul:
 "This time we have Andy updates on dw_dmac which is attempting to make
  this IP block available as PCI and platform device though not fully
  complete this time.

  We also have TI EDMA moving the dma driver to use dmaengine APIs, also
  have a new driver for mmp-tdma, along with bunch of small updates.

  Now for your excitement the merge is little unusual here, while
  merging the auto merge on linux-next picks wrong choice for pl330
  (drivers/dma/pl330.c) and this causes build failure.  The correct
  resolution is in linux-next.  (DMA: PL330: Fix build error) I didn't
  back merge your tree this time as you are better than me so no point
  in doing that for me :)"

Fixed the pl330 conflict as in linux-next, along with trivial header
file conflicts due to changed includes.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (29 commits)
  dma: tegra: fix interrupt name issue with apb dma.
  dw_dmac: fix a regression in dwc_prep_dma_memcpy
  dw_dmac: introduce software emulation of LLP transfers
  dw_dmac: autoconfigure data_width or get it via platform data
  dw_dmac: autoconfigure block_size or use platform data
  dw_dmac: get number of channels from hardware if possible
  dw_dmac: fill optional encoded parameters in register structure
  dw_dmac: mark dwc_dump_chan_regs as inline
  DMA: PL330: return ENOMEM instead of 0 from pl330_alloc_chan_resources
  DMA: PL330: Remove redundant runtime_suspend/resume functions
  DMA: PL330: Remove controller clock enable/disable
  dmaengine: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  DMA: PL330: Set the capability of pdm0 and pdm1 as DMA_PRIVATE
  ARM: EXYNOS: Set the capability of pdm0 and pdm1 as DMA_PRIVATE
  dma: tegra: use list_move_tail instead of list_del/list_add_tail
  mxs/dma: Enlarge the CCW descriptor area to 4 pages
  dw_dmac: utilize slave_id to pass request line
  dmaengine: mmp_tdma: add dt support
  dmaengine: mmp-pdma support
  spi: davici - make davinci select edma
  ...

1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index 45fbeed1c1a5..528c62dd4b00 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -169,6 +169,7 @@ typedef void (*dma_isr_handler)(struct tegra_dma_channel *tdc,
 /* tegra_dma_channel: Channel specific information */
 struct tegra_dma_channel {
         struct dma_chan         dma_chan;
+        char                    name[30];
         bool                    config_init;
         int                     id;
         int                     irq;
@@ -475,8 +476,7 @@ static void tegra_dma_abort_all(struct tegra_dma_channel *tdc)
         while (!list_empty(&tdc->pending_sg_req)) {
                 sgreq = list_first_entry(&tdc->pending_sg_req,
                                                 typeof(*sgreq), node);
-                list_del(&sgreq->node);
-                list_add_tail(&sgreq->node, &tdc->free_sg_req);
+                list_move_tail(&sgreq->node, &tdc->free_sg_req);
                 if (sgreq->last_sg) {
                         dma_desc = sgreq->dma_desc;
                         dma_desc->dma_status = DMA_ERROR;
@@ -570,8 +570,7 @@ static void handle_cont_sngl_cycle_dma_done(struct tegra_dma_channel *tdc,
 
         /* If not last req then put at end of pending list */
         if (!list_is_last(&sgreq->node, &tdc->pending_sg_req)) {
-                list_del(&sgreq->node);
-                list_add_tail(&sgreq->node, &tdc->pending_sg_req);
+                list_move_tail(&sgreq->node, &tdc->pending_sg_req);
                 sgreq->configured = false;
                 st = handle_continuous_head_request(tdc, sgreq, to_terminate);
                 if (!st)
@@ -1284,7 +1283,6 @@ static int __devinit tegra_dma_probe(struct platform_device *pdev)
         INIT_LIST_HEAD(&tdma->dma_dev.channels);
         for (i = 0; i < cdata->nr_channels; i++) {
                 struct tegra_dma_channel *tdc = &tdma->channels[i];
-                char irq_name[30];
 
                 tdc->chan_base_offset = TEGRA_APBDMA_CHANNEL_BASE_ADD_OFFSET +
                                         i * TEGRA_APBDMA_CHANNEL_REGISTER_SIZE;
@@ -1296,9 +1294,9 @@ static int __devinit tegra_dma_probe(struct platform_device *pdev)
                         goto err_irq;
                 }
                 tdc->irq = res->start;
-                snprintf(irq_name, sizeof(irq_name), "apbdma.%d", i);
+                snprintf(tdc->name, sizeof(tdc->name), "apbdma.%d", i);
                 ret = devm_request_irq(&pdev->dev, tdc->irq,
-                                tegra_dma_isr, 0, irq_name, tdc);
+                                tegra_dma_isr, 0, tdc->name, tdc);
                 if (ret) {
                         dev_err(&pdev->dev,
                                 "request_irq failed with err %d channel %d\n",