diff options
author | Alexandre Bounine <alexandre.bounine@idt.com> | 2012-03-08 15:35:13 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-21 09:50:23 -0400 |
commit | 185ecb5f4fd43911c35956d4cc7d94a1da30417f (patch) | |
tree | ebbdb7f15157d19d8af892cd7948d93947d09ec2 /drivers/dma/ep93xx_dma.c | |
parent | 16052827d98fbc13c31ebad560af4bd53e2b4dd5 (diff) |
dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic
Add context parameter to device_prep_slave_sg() and device_prep_dma_cyclic()
interfaces to allow passing client/target specific information associated
with the data transfer.
Modify all affected DMA engine drivers.
Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma/ep93xx_dma.c')
-rw-r--r-- | drivers/dma/ep93xx_dma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c index f25e83bf5678..e6f133b78dc2 100644 --- a/drivers/dma/ep93xx_dma.c +++ b/drivers/dma/ep93xx_dma.c | |||
@@ -975,13 +975,14 @@ fail: | |||
975 | * @sg_len: number of entries in @sgl | 975 | * @sg_len: number of entries in @sgl |
976 | * @dir: direction of tha DMA transfer | 976 | * @dir: direction of tha DMA transfer |
977 | * @flags: flags for the descriptor | 977 | * @flags: flags for the descriptor |
978 | * @context: operation context (ignored) | ||
978 | * | 979 | * |
979 | * Returns a valid DMA descriptor or %NULL in case of failure. | 980 | * Returns a valid DMA descriptor or %NULL in case of failure. |
980 | */ | 981 | */ |
981 | static struct dma_async_tx_descriptor * | 982 | static struct dma_async_tx_descriptor * |
982 | ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, | 983 | ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, |
983 | unsigned int sg_len, enum dma_transfer_direction dir, | 984 | unsigned int sg_len, enum dma_transfer_direction dir, |
984 | unsigned long flags) | 985 | unsigned long flags, void *context) |
985 | { | 986 | { |
986 | struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan); | 987 | struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan); |
987 | struct ep93xx_dma_desc *desc, *first; | 988 | struct ep93xx_dma_desc *desc, *first; |
@@ -1048,6 +1049,7 @@ fail: | |||
1048 | * @buf_len: length of the buffer (in bytes) | 1049 | * @buf_len: length of the buffer (in bytes) |
1049 | * @period_len: lenght of a single period | 1050 | * @period_len: lenght of a single period |
1050 | * @dir: direction of the operation | 1051 | * @dir: direction of the operation |
1052 | * @context: operation context (ignored) | ||
1051 | * | 1053 | * |
1052 | * Prepares a descriptor for cyclic DMA operation. This means that once the | 1054 | * Prepares a descriptor for cyclic DMA operation. This means that once the |
1053 | * descriptor is submitted, we will be submitting in a @period_len sized | 1055 | * descriptor is submitted, we will be submitting in a @period_len sized |
@@ -1060,7 +1062,7 @@ fail: | |||
1060 | static struct dma_async_tx_descriptor * | 1062 | static struct dma_async_tx_descriptor * |
1061 | ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr, | 1063 | ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr, |
1062 | size_t buf_len, size_t period_len, | 1064 | size_t buf_len, size_t period_len, |
1063 | enum dma_transfer_direction dir) | 1065 | enum dma_transfer_direction dir, void *context) |
1064 | { | 1066 | { |
1065 | struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan); | 1067 | struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan); |
1066 | struct ep93xx_dma_desc *desc, *first; | 1068 | struct ep93xx_dma_desc *desc, *first; |