• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma · c7a19c79
    Linus Torvalds authored
    Pull slave-dma updates from Vinod Koul:
     "Some notable changes are:
       - new driver for AMBA AXI NBPF by Guennadi
       - new driver for sun6i controller by Maxime
       - pl330 drivers fixes from Lar's
       - sh-dma updates and fixes from Laurent, Geert and Kuninori
       - Documentation updates from Geert
       - drivers fixes and updates spread over dw, edma, freescale, mpc512x
         etc.."
    
    * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (72 commits)
      dmaengine: sun6i: depends on RESET_CONTROLLER
      dma: at_hdmac: fix invalid remaining bytes detection
      dmaengine: nbpfaxi: don't build this driver where it cannot be used
      dmaengine: nbpf_error_get_channel() can be static
      dma: pl08x: Use correct specifier for size_t values
      dmaengine: Remove the context argument to the prep_dma_cyclic operation
      dmaengine: nbpfaxi: convert to tasklet
      dmaengine: nbpfaxi: fix a theoretical race
      dmaengine: add a driver for AMBA AXI NBPF DMAC IP cores
      dmaengine: add device tree binding documentation for the nbpfaxi driver
      dmaengine: edma: Do not register second device when booted with DT
      dmaengine: edma: Do not change the error code returned from edma_alloc_slot
      dmaengine: rcar-dmac: Add device tree bindings documentation
      dmaengine: shdma: Allocate cyclic sg list dynamically
      dmaengine: shdma: Make channel filter ignore unrelated devices
      dmaengine: sh: Rework Kconfig and Makefile
      dmaengine: sun6i: Fix memory leaks
      dmaengine: sun6i: Free the interrupt before killing the tasklet
      dmaengine: sun6i: Remove switch statement from buswidth convertion routine
      dmaengine: of: kconfig: select DMA_ENGINE when DMA_OF is selected
      ...
    c7a19c79
edma.c 30 KB