From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Apr 2015 16:49:37 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v4.1-rc1~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d6a4c0e5d3d433ef296f8f417e835329a834a256;p=linux-2.6-block.git

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

Pull slave-dmaengine updates from Vinod Koul:

 - new drivers for:
        - Ingenic JZ4780 controller
        - APM X-Gene controller
        - Freescale RaidEngine device
        - Renesas USB Controller

  - remove device_alloc_chan_resources dummy handlers

  - sh driver cleanups for peri peri and related emmc and asoc patches
    as well

  - fixes and enhancements spread over the drivers

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (59 commits)
  dmaengine: dw: don't prompt for DW_DMAC_CORE
  dmaengine: shdmac: avoid unused variable warnings
  dmaengine: fix platform_no_drv_owner.cocci warnings
  dmaengine: pch_dma: fix memory leak on failure path in pch_dma_probe()
  dmaengine: at_xdmac: unlock spin lock before return
  dmaengine: xgene: devm_ioremap() returns NULL on error
  dmaengine: xgene: buffer overflow in xgene_dma_init_channels()
  dmaengine: usb-dmac: Fix dereferencing freed memory 'desc'
  dmaengine: sa11x0: report slave capabilities to upper layers
  dmaengine: vdma: Fix compilation warnings
  dmaengine: fsl_raid: statify fsl_re_chan_probe
  dmaengine: Driver support for FSL RaidEngine device.
  dmaengine: xgene_dma_init_ring_mngr() can be static
  Documentation: dma: Add documentation for the APM X-Gene SoC DMA device DTS binding
  arm64: dts: Add APM X-Gene SoC DMA device and DMA clock DTS nodes
  dmaengine: Add support for APM X-Gene SoC DMA engine driver
  dmaengine: usb-dmac: Add Renesas USB DMA Controller (USB-DMAC) driver
  dmaengine: renesas,usb-dmac: Add device tree bindings documentation
  dmaengine: edma: fixed wrongly initialized data parameter to the edma callback
  dmaengine: ste_dma40: fix implicit conversion
  ...
---

d6a4c0e5d3d433ef296f8f417e835329a834a256
diff --cc drivers/dma/Kconfig
index 91eced044321,b674683de24b..fd7ac13f2574
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@@ -112,8 -125,17 +112,19 @@@ config FSL_DM
  	  EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the Elo3 is on
  	  some Txxx and Bxxx parts.
  
+ config FSL_RAID
+         tristate "Freescale RAID engine Support"
+         depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH
+         select DMA_ENGINE
+         select DMA_ENGINE_RAID
+         ---help---
+           Enable support for Freescale RAID Engine. RAID Engine is
+           available on some QorIQ SoCs (like P5020/P5040). It has
+           the capability to offload memcpy, xor and pq computation
+ 	  for raid5/6.
+ 
 +source "drivers/dma/hsu/Kconfig"
 +
  config MPC512X_DMA
  	tristate "Freescale MPC512x built-in DMA engine support"
  	depends on PPC_MPC512x || PPC_MPC831x