diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 21:39:09 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 21:39:09 +0530 |
| commit | cf6c0ab54daeb614ae79bdd0168e8b7ec2650134 (patch) | |
| tree | a5dbdf23ae9184edce0cab7944df9798da309a1d /include | |
| parent | 2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e (diff) | |
| parent | b80719b6bd083130c112cb4d3e5329a164eef4c3 (diff) | |
| download | linux-cf6c0ab54daeb614ae79bdd0168e8b7ec2650134.tar.gz | |
Merge branch 'topic/dma_control_fsl_acks' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dmaengine.h | 13 | ||||
| -rw-r--r-- | include/linux/fsldma.h | 13 |
2 files changed, 23 insertions, 3 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 3d291f59acd8..3254a039b0e0 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -199,15 +199,12 @@ enum dma_ctrl_flags { * configuration data in statically from the platform). An additional * argument of struct dma_slave_config must be passed in with this * command. - * @FSLDMA_EXTERNAL_START: this command will put the Freescale DMA controller - * into external start mode. */ enum dma_ctrl_cmd { DMA_TERMINATE_ALL, DMA_PAUSE, DMA_RESUME, DMA_SLAVE_CONFIG, - FSLDMA_EXTERNAL_START, }; /** @@ -757,6 +754,16 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_interleaved_dma( return chan->device->device_prep_interleaved_dma(chan, xt, flags); } +static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_sg( + struct dma_chan *chan, + struct scatterlist *dst_sg, unsigned int dst_nents, + struct scatterlist *src_sg, unsigned int src_nents, + unsigned long flags) +{ + return chan->device->device_prep_dma_sg(chan, dst_sg, dst_nents, + src_sg, src_nents, flags); +} + static inline int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps) { if (!chan || !caps) diff --git a/include/linux/fsldma.h b/include/linux/fsldma.h new file mode 100644 index 000000000000..b213c02963c9 --- /dev/null +++ b/include/linux/fsldma.h @@ -0,0 +1,13 @@ +/* + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef FSL_DMA_H +#define FSL_DMA_H +/* fsl dma API for enxternal start */ +int fsl_dma_external_start(struct dma_chan *dchan, int enable); + +#endif |