Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine updates from Vinod Koul: - New driver for Qcom bam dma - New driver for RCAR peri-peri - New driver for FSL eDMA - Various odd fixes and updates thru the subsystem * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (29 commits) dmaengine: add Qualcomm BAM dma driver shdma: add R-Car Audio DMAC peri peri driver dmaengine: sirf: enable generic dt binding for dma channels dma: omap-dma: Implement device_slave_caps callback dmaengine: qcom_bam_dma: Add device tree binding dma: dw: Add suspend and resume handling for PCI mode DW_DMAC. dma: dw: allocate memory in two stages in probe Add new line to test result strings produced in verbose mode dmaengine: pch_dma: use tasklet_kill in teardown dmaengine: at_hdmac: use tasklet_kill in teardown dma: cppi41: start tear down only if channel is busy usb: musb: musb_cppi41: Dont reprogram DMA if tear down is initiated dmaengine: s3c24xx-dma: make phy->irq signed for error handling dma: imx-dma: Add missing module owner field dma: imx-dma: Replace printk with dev_* dma: fsl-edma: fix static checker warning of NULL dereference dma: Remove comment about embedding dma_slave_config into custom structs dma: mmp_tdma: move to generic device tree binding dma: mmp_pdma: add IRQF_SHARED when request irq dma: edma: Fix memory leak in edma_prep_dma_cyclic() ...
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/dma/fsl-edma.txt 76 additions, 0 deletionsDocumentation/devicetree/bindings/dma/fsl-edma.txt
- Documentation/devicetree/bindings/dma/qcom_bam_dma.txt 41 additions, 0 deletionsDocumentation/devicetree/bindings/dma/qcom_bam_dma.txt
- Documentation/devicetree/bindings/dma/sirfsoc-dma.txt 43 additions, 0 deletionsDocumentation/devicetree/bindings/dma/sirfsoc-dma.txt
- arch/arm/boot/dts/atlas6.dtsi 2 additions, 0 deletionsarch/arm/boot/dts/atlas6.dtsi
- arch/arm/boot/dts/prima2.dtsi 2 additions, 0 deletionsarch/arm/boot/dts/prima2.dtsi
- drivers/dma/Kconfig 20 additions, 1 deletiondrivers/dma/Kconfig
- drivers/dma/Makefile 2 additions, 0 deletionsdrivers/dma/Makefile
- drivers/dma/acpi-dma.c 9 additions, 8 deletionsdrivers/dma/acpi-dma.c
- drivers/dma/at_hdmac.c 0 additions, 1 deletiondrivers/dma/at_hdmac.c
- drivers/dma/cppi41.c 5 additions, 2 deletionsdrivers/dma/cppi41.c
- drivers/dma/dmaengine.c 2 additions, 7 deletionsdrivers/dma/dmaengine.c
- drivers/dma/dmatest.c 2 additions, 2 deletionsdrivers/dma/dmatest.c
- drivers/dma/dw/core.c 12 additions, 9 deletionsdrivers/dma/dw/core.c
- drivers/dma/dw/pci.c 36 additions, 0 deletionsdrivers/dma/dw/pci.c
- drivers/dma/dw/regs.h 2 additions, 2 deletionsdrivers/dma/dw/regs.h
- drivers/dma/edma.c 4 additions, 1 deletiondrivers/dma/edma.c
- drivers/dma/fsl-edma.c 975 additions, 0 deletionsdrivers/dma/fsl-edma.c
- drivers/dma/imx-dma.c 7 additions, 6 deletionsdrivers/dma/imx-dma.c
- drivers/dma/mmp_pdma.c 4 additions, 4 deletionsdrivers/dma/mmp_pdma.c
- drivers/dma/mmp_tdma.c 50 additions, 0 deletionsdrivers/dma/mmp_tdma.c
Loading
Please register or sign in to comment