From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Dec 2014 22:59:53 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v4.14-rc1~6317
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87c779baabff157f09db6fce417a7544220f9f00;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull dmaengine updates from Vinod Koul:
 "Main features this time are:

   - BAM v1.3.0 support form qcom bam dma
   - support for Allwinner sun8i dma
   - atmels eXtended DMA Controller driver
   - chancnt cleanup by Maxime
   - fixes spread over drivers"

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (56 commits)
  dmaenegine: Delete a check before free_percpu()
  dmaengine: ioatdma: fix dma mapping errors
  dma: cppi41: add a delay while setting the TD bit
  dma: cppi41: wait longer for the HW to return the descriptor
  dmaengine: fsl-edma: fixup reg offset and hw S/G support in big-endian model
  dmaengine: fsl-edma: fix calculation of remaining bytes
  drivers/dma/pch_dma: declare pch_dma_id_table as static
  dmaengine: ste_dma40: fix error return code
  dma: imx-sdma: clarify about firmware not found error
  Documentation: devicetree: Fix Xilinx VDMA specification
  dmaengine: pl330: update author info
  dmaengine: clarify the issue_pending expectations
  dmaengine: at_xdmac: Add DMA_PRIVATE
  ARM: dts: at_xdmac: fix bad value of dma-cells in documentation
  dmaengine: at_xdmac: fix missing spin_unlock
  dmaengine: at_xdmac: fix a bug in transfer residue computation
  dmaengine: at_xdmac: fix software lockup at_xdmac_tx_status()
  dmaengine: at_xdmac: remove chancnt affectation
  dmaengine: at_xdmac: prefer usage of readl/writel_relaxed
  dmaengine: xdmac: fix print warning on dma_addr_t variable
  ...
---

87c779baabff157f09db6fce417a7544220f9f00
diff --cc drivers/dma/sun6i-dma.c
index 91292f5,f9f8f4d..159f173
--- a/drivers/dma/sun6i-dma.c
+++ b/drivers/dma/sun6i-dma.c
@@@ -912,8 -963,6 +961,7 @@@ static int sun6i_dma_probe(struct platf
  	sdc->slave.device_prep_slave_sg		= sun6i_dma_prep_slave_sg;
  	sdc->slave.device_prep_dma_memcpy	= sun6i_dma_prep_dma_memcpy;
  	sdc->slave.device_control		= sun6i_dma_control;
- 	sdc->slave.chancnt			= NR_MAX_VCHANS;
 +	sdc->slave.copy_align			= 4;
  
  	sdc->slave.dev = &pdev->dev;