diff options
Diffstat (limited to 'include/linux/dmaengine.h')
-rw-r--r-- | include/linux/dmaengine.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 09ef23ee8bce..fa6b4285d8d2 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
@@ -22,6 +22,7 @@ | |||
22 | #define LINUX_DMAENGINE_H | 22 | #define LINUX_DMAENGINE_H |
23 | 23 | ||
24 | #include <linux/device.h> | 24 | #include <linux/device.h> |
25 | #include <linux/err.h> | ||
25 | #include <linux/uio.h> | 26 | #include <linux/uio.h> |
26 | #include <linux/bug.h> | 27 | #include <linux/bug.h> |
27 | #include <linux/scatterlist.h> | 28 | #include <linux/scatterlist.h> |
@@ -305,9 +306,8 @@ enum dma_slave_buswidth { | |||
305 | /** | 306 | /** |
306 | * struct dma_slave_config - dma slave channel runtime config | 307 | * struct dma_slave_config - dma slave channel runtime config |
307 | * @direction: whether the data shall go in or out on this slave | 308 | * @direction: whether the data shall go in or out on this slave |
308 | * channel, right now. DMA_TO_DEVICE and DMA_FROM_DEVICE are | 309 | * channel, right now. DMA_MEM_TO_DEV and DMA_DEV_TO_MEM are |
309 | * legal values, DMA_BIDIRECTIONAL is not acceptable since we | 310 | * legal values. |
310 | * need to differentiate source and target addresses. | ||
311 | * @src_addr: this is the physical address where DMA slave data | 311 | * @src_addr: this is the physical address where DMA slave data |
312 | * should be read (RX), if the source is memory this argument is | 312 | * should be read (RX), if the source is memory this argument is |
313 | * ignored. | 313 | * ignored. |
@@ -1040,6 +1040,8 @@ enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); | |||
1040 | void dma_issue_pending_all(void); | 1040 | void dma_issue_pending_all(void); |
1041 | struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, | 1041 | struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, |
1042 | dma_filter_fn fn, void *fn_param); | 1042 | dma_filter_fn fn, void *fn_param); |
1043 | struct dma_chan *dma_request_slave_channel_reason(struct device *dev, | ||
1044 | const char *name); | ||
1043 | struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name); | 1045 | struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name); |
1044 | void dma_release_channel(struct dma_chan *chan); | 1046 | void dma_release_channel(struct dma_chan *chan); |
1045 | #else | 1047 | #else |
@@ -1063,6 +1065,11 @@ static inline struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, | |||
1063 | { | 1065 | { |
1064 | return NULL; | 1066 | return NULL; |
1065 | } | 1067 | } |
1068 | static inline struct dma_chan *dma_request_slave_channel_reason( | ||
1069 | struct device *dev, const char *name) | ||
1070 | { | ||
1071 | return ERR_PTR(-ENODEV); | ||
1072 | } | ||
1066 | static inline struct dma_chan *dma_request_slave_channel(struct device *dev, | 1073 | static inline struct dma_chan *dma_request_slave_channel(struct device *dev, |
1067 | const char *name) | 1074 | const char *name) |
1068 | { | 1075 | { |