diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 20:06:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 20:06:22 -0500 |
commit | 97a229f90731894f46b85c20bcc1842f4a63cb78 (patch) | |
tree | 4c3e123eb1aab97b1d6c2e494b348b935414b84a /include/linux/dmaengine.h | |
parent | ff58d005cd10fcd372787cceac547e11cf706ff6 (diff) | |
parent | 1ad651154b0dfccde5a83fafbe81cff19791f359 (diff) |
Merge tag 'dmaengine-4.11-rc1' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine updates from Vinod Koul:
"This time we fairly boring and bit small update.
- Support for Intel iDMA 32-bit hardware
- deprecate broken support for channel switching in async_tx
- bunch of updates on stm32-dma
- Cyclic support for zx dma and making in generic zx dma driver
- Small updates to bunch of other drivers"
* tag 'dmaengine-4.11-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (29 commits)
async_tx: deprecate broken support for channel switching
dmaengine: rcar-dmac: Widen DMA mask to 40 bits
dmaengine: sun6i: allow build on ARM64 platforms (sun50i)
dmaengine: Provide a wrapper for memcpy operations
dmaengine: zx: fix build warning
dmaengine: dw: we do support Merrifield SoC in PCI mode
dmaengine: dw: add support of iDMA 32-bit hardware
dmaengine: dw: introduce register mappings for iDMA 32-bit
dmaengine: dw: introduce block2bytes() and bytes2block()
dmaengine: dw: extract dwc_chan_pause() for future use
dmaengine: dw: replace convert_burst() with one liner
dmaengine: dw: register IRQ and DMA pool with instance ID
dmaengine: dw: Fix data corruption in large device to memory transfers
dmaengine: ste_dma40: indicate granularity on channels
dmaengine: ste_dma40: indicate directions on channels
dmaengine: stm32-dma: Add error messages if xlate fails
dmaengine: dw: pci: remove LPE Audio DMA ID
dmaengine: stm32-dma: Add max_burst support
dmaengine: stm32-dma: Add synchronization support
dmaengine: stm32-dma: Fix residue computation issue in cyclic mode
...
Diffstat (limited to 'include/linux/dmaengine.h')
-rw-r--r-- | include/linux/dmaengine.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index feee6ec6a13b..533680860865 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
@@ -894,6 +894,17 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_memset( | |||
894 | len, flags); | 894 | len, flags); |
895 | } | 895 | } |
896 | 896 | ||
897 | static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_memcpy( | ||
898 | struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, | ||
899 | size_t len, unsigned long flags) | ||
900 | { | ||
901 | if (!chan || !chan->device || !chan->device->device_prep_dma_memcpy) | ||
902 | return NULL; | ||
903 | |||
904 | return chan->device->device_prep_dma_memcpy(chan, dest, src, | ||
905 | len, flags); | ||
906 | } | ||
907 | |||
897 | static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_sg( | 908 | static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_sg( |
898 | struct dma_chan *chan, | 909 | struct dma_chan *chan, |
899 | struct scatterlist *dst_sg, unsigned int dst_nents, | 910 | struct scatterlist *dst_sg, unsigned int dst_nents, |