Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine updates from Vinod Koul: "Once you have some time from extended weekend celebrations please consider pulling the following to get: - Various fixes and PCI driver for dw_dmac by Andy - DT binding for imx-dma by Markus & imx-sdma by Shawn - DT fixes for dmaengine by Lars - jz4740 dmac driver by Lars - and various fixes across the drivers" What "extended weekend celebrations"? I'm in the merge window, who has time for extended celebrations.. * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (40 commits) DMA: shdma: add DT support DMA: shdma: shdma_chan_filter() has to be in shdma-base.h DMA: shdma: (cosmetic) don't re-calculate a pointer dmaengine: at_hdmac: prepare clk before calling enable dmaengine/trivial: at_hdmac: add curly brackets to if/else expressions dmaengine: at_hdmac: remove unsuded atc_cleanup_descriptors() dmaengine: at_hdmac: add FIFO configuration parameter to DMA DT binding ARM: at91: dt: add header to define at_hdmac configuration MIPS: jz4740: Correct clock gate bit for DMA controller MIPS: jz4740: Remove custom DMA API MIPS: jz4740: Register jz4740 DMA device dma: Add a jz4740 dmaengine driver MIPS: jz4740: Acquire and enable DMA controller clock dma: mmp_tdma: disable irq when disabling dma channel dmaengine: PL08x: Avoid collisions with get_signal() macro dmaengine: dw: select DW_DMAC_BIG_ENDIAN_IO automagically dma: dw: add PCI part of the driver dma: dw: split driver to library part and platform code dma: move dw_dmac driver to an own directory dw_dmac: don't check resource with devm_ioremap_resource ...
Showing
- Documentation/devicetree/bindings/dma/atmel-dma.txt 5 additions, 2 deletionsDocumentation/devicetree/bindings/dma/atmel-dma.txt
- Documentation/devicetree/bindings/dma/fsl-imx-dma.txt 48 additions, 0 deletionsDocumentation/devicetree/bindings/dma/fsl-imx-dma.txt
- Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 56 additions, 0 deletionsDocumentation/devicetree/bindings/dma/fsl-imx-sdma.txt
- Documentation/devicetree/bindings/dma/shdma.txt 75 additions, 0 deletionsDocumentation/devicetree/bindings/dma/shdma.txt
- MAINTAINERS 1 addition, 2 deletionsMAINTAINERS
- arch/arm/mach-lpc32xx/phy3250.c 2 additions, 2 deletionsarch/arm/mach-lpc32xx/phy3250.c
- arch/arm/mach-spear/spear3xx.c 2 additions, 2 deletionsarch/arm/mach-spear/spear3xx.c
- arch/arm/mach-spear/spear6xx.c 2 additions, 2 deletionsarch/arm/mach-spear/spear6xx.c
- arch/mips/include/asm/mach-jz4740/dma.h 0 additions, 56 deletionsarch/mips/include/asm/mach-jz4740/dma.h
- arch/mips/include/asm/mach-jz4740/platform.h 1 addition, 0 deletionsarch/mips/include/asm/mach-jz4740/platform.h
- arch/mips/jz4740/Makefile 1 addition, 1 deletionarch/mips/jz4740/Makefile
- arch/mips/jz4740/board-qi_lb60.c 1 addition, 0 deletionsarch/mips/jz4740/board-qi_lb60.c
- arch/mips/jz4740/clock.c 1 addition, 1 deletionarch/mips/jz4740/clock.c
- arch/mips/jz4740/dma.c 0 additions, 287 deletionsarch/mips/jz4740/dma.c
- arch/mips/jz4740/platform.c 21 additions, 0 deletionsarch/mips/jz4740/platform.c
- drivers/dma/Kconfig 7 additions, 19 deletionsdrivers/dma/Kconfig
- drivers/dma/Makefile 2 additions, 1 deletiondrivers/dma/Makefile
- drivers/dma/amba-pl08x.c 4 additions, 4 deletionsdrivers/dma/amba-pl08x.c
- drivers/dma/at_hdmac.c 149 additions, 62 deletionsdrivers/dma/at_hdmac.c
- drivers/dma/at_hdmac_regs.h 5 additions, 0 deletionsdrivers/dma/at_hdmac_regs.h
Loading
Please register or sign in to comment