From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Nov 2015 18:05:17 +0000 (-0800)
Subject: Merge tag 'dmaengine-4.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~5567
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=041c79514af9080c75197078283134f538f46b44;p=mirror_ubuntu-zesty-kernel.git

Merge tag 'dmaengine-4.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine updates from Vinod Koul:
 "This time we have a very typical update which is mostly fixes and
  updates to drivers and no new drivers.

   - the biggest change is coming from Peter for edma cleanup which even
     caused some last minute regression, things seem settled now
   - idma64 and dw updates
   - iotdma updates
   - module autoload fixes for various drivers
   - scatter gather support for hdmac"

* tag 'dmaengine-4.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (77 commits)
  dmaengine: edma: Add dummy driver skeleton for edma3-tptc
  Revert "ARM: DTS: am33xx: Use the new DT bindings for the eDMA3"
  Revert "ARM: DTS: am437x: Use the new DT bindings for the eDMA3"
  dmaengine: dw: some Intel devices has no memcpy support
  dmaengine: dw: platform: provide platform data for Intel
  dmaengine: dw: don't override platform data with autocfg
  dmaengine: hdmac: Add scatter-gathered memset support
  dmaengine: hdmac: factorise memset descriptor allocation
  dmaengine: virt-dma: Fix kernel-doc annotations
  ARM: DTS: am437x: Use the new DT bindings for the eDMA3
  ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
  dmaengine: edma: New device tree binding
  dmaengine: Kconfig: edma: Select TI_DMA_CROSSBAR in case of ARCH_OMAP
  dmaengine: ti-dma-crossbar: Add support for crossbar on AM33xx/AM43xx
  dmaengine: edma: Merge the of parsing functions
  dmaengine: edma: Do not allocate memory for edma_rsv_info in case of DT boot
  dmaengine: edma: Refactor the dma device and channel struct initialization
  dmaengine: edma: Get qDMA channel information from HW also
  dmaengine: edma: Merge map_dmach_to_queue into assign_channel_eventq
  dmaengine: edma: Correct PaRAM access function names (_parm_ to _param_)
  ...
---

041c79514af9080c75197078283134f538f46b44
diff --cc drivers/dma/dw/core.c
index bedce038c6e2,41e9554b884d..7067b6ddc1db
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@@ -1589,8 -1587,9 +1587,8 @@@ int dw_dma_probe(struct dw_dma_chip *ch
  		goto err_pdata;
  
  	INIT_LIST_HEAD(&dw->dma.channels);
- 	for (i = 0; i < nr_channels; i++) {
+ 	for (i = 0; i < pdata->nr_channels; i++) {
  		struct dw_dma_chan	*dwc = &dw->chan[i];
 -		int			r = nr_channels - i - 1;
  
  		dwc->chan.device = &dw->dma;
  		dma_cookie_init(&dwc->chan);