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

Merged and Committed by Linus Torvalds 8 years ago
40 files changed. 3329 lines added. 497 lines removed.
Documentation/devicetree/bindings/dma/dma.txt
file modified
+28 -0
Documentation/devicetree/bindings/dma/mv-xor.txt
file modified
+1 -1
Documentation/devicetree/bindings/dma/sirfsoc-dma.txt
file modified
+2 -1
Documentation/devicetree/bindings/dma/sun6i-dma.txt
file modified
+4 -1
Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
file added
+52
Documentation/dmaengine/provider.txt
file modified
+6 -5
Documentation/dmaengine/pxa_dma.txt
file added
+153
MAINTAINERS
file modified
+1 -0
drivers/dma/Kconfig
file modified
+15 -0
drivers/dma/Makefile
file modified
+2 -0
drivers/dma/amba-pl08x.c
file modified
+1 -1
drivers/dma/at_hdmac.c
file modified
+106 -0
drivers/dma/at_hdmac_regs.h
file modified
+5 -0
drivers/dma/at_xdmac.c
file modified
+342 -52
drivers/dma/dmaengine.c
file modified
+11 -2
drivers/dma/ep93xx_dma.c
file modified
+1 -1
drivers/dma/fsl-edma.c
file modified
+5 -4
drivers/dma/imx-dma.c
file modified
+1 -1
drivers/dma/imx-sdma.c
file modified
+1 -1
drivers/dma/mv_xor.c
file modified
+190 -162
drivers/dma/mv_xor.h
file modified
+15 -12
drivers/dma/mxs-dma.c
file modified
+1 -1
drivers/dma/nbpfaxi.c
file modified
+1 -1
drivers/dma/of-dma.c
file modified
+89 -0
drivers/dma/omap-dma.c
file modified
+72 -8
drivers/dma/pl330.c
file modified
+5 -3
drivers/dma/pxa_dma.c
file added
+1467
drivers/dma/s3c24xx-dma.c
file modified
+1 -1
drivers/dma/sh/rcar-dmac.c
file modified
+1 -1
drivers/dma/sh/shdma-r8a73a4.c
file modified
+1 -1
drivers/dma/sirf-dma.c
file modified
+334 -89
drivers/dma/sun6i-dma.c
file modified
+12 -0
drivers/dma/ti-dma-crossbar.c
file added
+188
drivers/dma/virt-dma.c
file modified
+13 -6
drivers/dma/virt-dma.h
file modified
+12 -1
drivers/dma/xgene-dma.c
file modified
+66 -107
include/linux/dma/pxa-dma.h
file added
+27
include/linux/dmaengine.h
file modified
+76 -0
include/linux/of_dma.h
file modified
+21 -0
include/linux/platform_data/dma-rcar-audmapp.h
file removed
-34
    Merge tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma
    
    Pull dmaengine updates from Vinod Koul:
     "This time we have support for few new devices, few new features and
      odd fixes spread thru the subsystem.
    
      New devices added:
       - support for CSRatlas7 dma controller
       - Allwinner H3(sun8i) controller
       - TI DMA crossbar driver on DRA7x
       - new pxa driver
    
      New features added:
       - memset support is bought back now that we have a user in xdmac controller
       - interleaved transfers support different source and destination strides
       - supporting DMA routers and configuration thru DT
       - support for reusing descriptors
       - xdmac memset and interleaved transfer support
       - hdmac support for interleaved transfers
       - omap-dma support for memcpy
    
      Others:
       - Constify platform_device_id
       - mv_xor fixes and improvements"
    
    * tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
      dmaengine: xgene: fix file permission
      dmaengine: fsl-edma: clear pending interrupts on initialization
      dmaengine: xdmac: Add memset support
      Documentation: dmaengine: document DMA_CTRL_ACK
      dmaengine: virt-dma: don't always free descriptor upon completion
      dmaengine: Revert "drivers/dma: remove unused support for MEMSET operations"
      dmaengine: hdmac: Implement interleaved transfers
      dmaengine: Move icg helpers to global header
      dmaengine: mv_xor: improve descriptors list handling and reduce locking
      dmaengine: mv_xor: Enlarge descriptor pool size
      dmaengine: mv_xor: add support for a38x command in descriptor mode
      dmaengine: mv_xor: Rename function for consistent naming
      dmaengine: mv_xor: bug fix for racing condition in descriptors cleanup
      dmaengine: pl330: fix wording in mcbufsz message
      dmaengine: sirf: add CSRatlas7 SoC support
      dmaengine: xgene-dma: Fix "incorrect type in assignement" warnings
      dmaengine: fix kernel-doc documentation
      dmaengine: pxa_dma: add support for legacy transition
      dmaengine: pxa_dma: add debug information
      dmaengine: pxa: add pxa dmaengine driver
      ...
    
        
file modified
+1 -0
file modified
+15 -0
file modified
+2 -0
file modified
+1 -1
file modified
+106 -0
file modified
+5 -0
file modified
+342 -52
file modified
+11 -2
file modified
+1 -1
file modified
+5 -4
file modified
+1 -1
file modified
+1 -1
file modified
+190 -162
file modified
+15 -12
file modified
+1 -1
file modified
+1 -1
file modified
+89 -0
file modified
+72 -8
file modified
+5 -3
file added
+1467
file modified
+1 -1
file modified
+1 -1
file modified
+334 -89
file modified
+12 -0
file modified
+13 -6
file modified
+12 -1
file modified
+66 -107
file modified
+76 -0
file modified
+21 -0