Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: dma: Add SoF and EoF debugging to ipu_idmac.c, minor cleanup dw_dmac: add cyclic API to DW DMA driver dmaengine: Add privatecnt to revert DMA_PRIVATE property dmatest: add dma interrupts and callbacks dmatest: add xor test dmaengine: allow dma support for async_tx to be toggled async_tx: provide __async_inline for HAS_DMA=n archs dmaengine: kill some unused headers dmaengine: initialize tx_list in dma_async_tx_descriptor_init dma: i.MX31 IPU DMA robustness improvements dma: improve section assignment in i.MX31 IPU DMA driver dma: ipu_idmac driver cosmetic clean-up dmaengine: fail device registration if channel registration fails
Showing
- crypto/async_tx/async_tx.c 3 additions, 3 deletionscrypto/async_tx/async_tx.c
- crypto/async_tx/async_xor.c 2 additions, 5 deletionscrypto/async_tx/async_xor.c
- drivers/dma/Kconfig 11 additions, 0 deletionsdrivers/dma/Kconfig
- drivers/dma/dmaengine.c 48 additions, 12 deletionsdrivers/dma/dmaengine.c
- drivers/dma/dmatest.c 214 additions, 93 deletionsdrivers/dma/dmatest.c
- drivers/dma/dw_dmac.c 331 additions, 2 deletionsdrivers/dma/dw_dmac.c
- drivers/dma/dw_dmac_regs.h 6 additions, 1 deletiondrivers/dma/dw_dmac_regs.h
- drivers/dma/fsldma.c 0 additions, 1 deletiondrivers/dma/fsldma.c
- drivers/dma/ioat_dma.c 0 additions, 1 deletiondrivers/dma/ioat_dma.c
- drivers/dma/iop-adma.c 0 additions, 1 deletiondrivers/dma/iop-adma.c
- drivers/dma/ipu/ipu_idmac.c 254 additions, 117 deletionsdrivers/dma/ipu/ipu_idmac.c
- drivers/dma/ipu/ipu_irq.c 1 addition, 1 deletiondrivers/dma/ipu/ipu_irq.c
- drivers/dma/mv_xor.c 0 additions, 1 deletiondrivers/dma/mv_xor.c
- include/linux/async_tx.h 9 additions, 0 deletionsinclude/linux/async_tx.h
- include/linux/dmaengine.h 27 additions, 3 deletionsinclude/linux/dmaengine.h
- include/linux/dw_dmac.h 19 additions, 0 deletionsinclude/linux/dw_dmac.h
Loading
Please register or sign in to comment