Hey Linus, Here is the pull request for this merge window. Please pull to receive: - 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 The following changes since commit b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed: Linus Torvalds (1): Linux 3.14-rc2 are available in the git repository at: git://git.infradead.org/users/vkoul/slave-dma.git for-linus Alexander Shiyan (2): dma: imx-dma: Replace printk with dev_* dma: imx-dma: Add missing module owner field Andy Gross (2): dmaengine: qcom_bam_dma: Add device tree binding dmaengine: add Qualcomm BAM dma driver Andy Shevchenko (5): acpi-dma: use devm_release() instead of devm_destroy() acpi-dma: convert to return error code when asked for channel dma: dw: add a PCI ID for Intel Haswell SoC dma: dw: remove leftovers in the comment blocks dma: dw: allocate memory in two stages in probe Barry Song (1): dmaengine: sirf: enable generic dt binding for dma channels Chao Xie (1): dma: mmp_pdma: add IRQF_SHARED when request irq Chew, Chiau Ee (1): dma: dw: Add suspend and resume handling for PCI mode DW_DMAC. Christian Engelmayer (1): dma: edma: Fix memory leak in edma_prep_dma_cyclic() Dan Carpenter (1): dmaengine: s3c24xx-dma: make phy->irq signed for error handling George Cherian (2): usb: musb: musb_cppi41: Dont reprogram DMA if tear down is initiated dma: cppi41: start tear down only if channel is busy Jerome Blin (1): Add new line to test result strings produced in verbose mode Jingchang Lu (2): dma: Add Freescale eDMA engine driver support dma: fsl-edma: fix static checker warning of NULL dereference Kuninori Morimoto (1): shdma: add R-Car Audio DMAC peri peri driver Lars-Peter Clausen (1): dma: Remove comment about embedding dma_slave_config into custom structs Laurent Pinchart (3): DMA: shdma: Fix warnings due to improper casts and printk formats DMA: shdma: Fix warnings due to declared but unused symbols DMA: shdma: Make sh_dmae_pm static Nenghua Cao (1): dma: mmp_tdma: move to generic device tree binding Paul Bolle (1): dmaengine: Remove dependency on MACH_BCM2708 Peter Ujfalusi (1): dma: omap-dma: Implement device_slave_caps callback Vinod Koul (4): dmaengine: at_hdmac: use tasklet_kill in teardown dmaengine: pch_dma: use tasklet_kill in teardown Merge branch 'topic/tasklet_fix' into for-linus Merge branch 'topic/bam' into for-linus Documentation/devicetree/bindings/dma/fsl-edma.txt | 76 ++ .../devicetree/bindings/dma/qcom_bam_dma.txt | 41 + .../devicetree/bindings/dma/sirfsoc-dma.txt | 43 + arch/arm/boot/dts/atlas6.dtsi | 2 + arch/arm/boot/dts/prima2.dtsi | 2 + drivers/dma/Kconfig | 21 +- drivers/dma/Makefile | 2 + drivers/dma/acpi-dma.c | 17 +- drivers/dma/at_hdmac.c | 1 - drivers/dma/cppi41.c | 7 +- drivers/dma/dmaengine.c | 9 +- drivers/dma/dmatest.c | 4 +- drivers/dma/dw/core.c | 21 +- drivers/dma/dw/pci.c | 36 + drivers/dma/dw/regs.h | 4 +- drivers/dma/edma.c | 5 +- drivers/dma/fsl-edma.c | 975 +++++++++++++++++ drivers/dma/imx-dma.c | 13 +- drivers/dma/mmp_pdma.c | 8 +- drivers/dma/mmp_tdma.c | 50 + drivers/dma/omap-dma.c | 18 + drivers/dma/pch_dma.c | 4 +- drivers/dma/qcom_bam_dma.c | 1111 ++++++++++++++++++++ drivers/dma/s3c24xx-dma.c | 2 +- drivers/dma/sh/Kconfig | 6 + drivers/dma/sh/Makefile | 1 + drivers/dma/sh/rcar-audmapp.c | 320 ++++++ drivers/dma/sh/shdma-base.c | 10 +- drivers/dma/sh/shdma-of.c | 3 +- drivers/dma/sh/shdmac.c | 13 +- drivers/dma/sh/sudmac.c | 4 +- drivers/dma/sirf-dma.c | 23 + drivers/usb/musb/musb_cppi41.c | 3 +- include/linux/acpi_dma.h | 5 +- include/linux/dmaengine.h | 14 +- include/linux/dw_dmac.h | 5 +- include/linux/platform_data/dma-rcar-audmapp.h | 34 + 37 files changed, 2839 insertions(+), 74 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/fsl-edma.txt create mode 100644 Documentation/devicetree/bindings/dma/qcom_bam_dma.txt create mode 100644 Documentation/devicetree/bindings/dma/sirfsoc-dma.txt create mode 100644 drivers/dma/fsl-edma.c create mode 100644 drivers/dma/qcom_bam_dma.c create mode 100644 drivers/dma/sh/rcar-audmapp.c create mode 100644 include/linux/platform_data/dma-rcar-audmapp.h Thanks -- ~Vinod
Attachment:
signature.asc
Description: Digital signature