Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma · d2b4a646
    Linus Torvalds authored
    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
      ...
    d2b4a646