diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-11-17 08:42:00 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-12-22 01:58:56 -0500 |
commit | 94a73e30dfe6722e9f4ef19f7892901d7d00eab1 (patch) | |
tree | 83344705ec2ceab29f54837173decdbdd0e74d77 /include/linux/dmaengine.h | |
parent | c4b54a648e682f678c338619df848233a6babc46 (diff) |
dmaengine: Introduce a device_config callback
The fact that the channel configuration is done in device_control is rather
misleading, since it's not really advertised as such, plus, the fact that the
framework exposes a function of its own makes it not really intuitive, while
we're losing the type checking whenever we pass that unsigned long argument.
Add a device_config callback to dma_device, with a fallback on the old
behaviour for now for existing drivers to opt in.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'include/linux/dmaengine.h')
-rw-r--r-- | include/linux/dmaengine.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 03a1febe8740..cf7c85d408ad 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
@@ -608,6 +608,8 @@ struct dma_tx_state { | |||
608 | * The function takes a buffer of size buf_len. The callback function will | 608 | * The function takes a buffer of size buf_len. The callback function will |
609 | * be called after period_len bytes have been transferred. | 609 | * be called after period_len bytes have been transferred. |
610 | * @device_prep_interleaved_dma: Transfer expression in a generic way. | 610 | * @device_prep_interleaved_dma: Transfer expression in a generic way. |
611 | * @device_config: Pushes a new configuration to a channel, return 0 or an error | ||
612 | * code | ||
611 | * @device_control: manipulate all pending operations on a channel, returns | 613 | * @device_control: manipulate all pending operations on a channel, returns |
612 | * zero or error code | 614 | * zero or error code |
613 | * @device_tx_status: poll for transaction completion, the optional | 615 | * @device_tx_status: poll for transaction completion, the optional |
@@ -674,6 +676,9 @@ struct dma_device { | |||
674 | struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)( | 676 | struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)( |
675 | struct dma_chan *chan, struct dma_interleaved_template *xt, | 677 | struct dma_chan *chan, struct dma_interleaved_template *xt, |
676 | unsigned long flags); | 678 | unsigned long flags); |
679 | |||
680 | int (*device_config)(struct dma_chan *chan, | ||
681 | struct dma_slave_config *config); | ||
677 | int (*device_control)(struct dma_chan *chan, enum dma_ctrl_cmd cmd, | 682 | int (*device_control)(struct dma_chan *chan, enum dma_ctrl_cmd cmd, |
678 | unsigned long arg); | 683 | unsigned long arg); |
679 | 684 | ||
@@ -697,6 +702,9 @@ static inline int dmaengine_device_control(struct dma_chan *chan, | |||
697 | static inline int dmaengine_slave_config(struct dma_chan *chan, | 702 | static inline int dmaengine_slave_config(struct dma_chan *chan, |
698 | struct dma_slave_config *config) | 703 | struct dma_slave_config *config) |
699 | { | 704 | { |
705 | if (chan->device->device_config) | ||
706 | return chan->device->device_config(chan, config); | ||
707 | |||
700 | return dmaengine_device_control(chan, DMA_SLAVE_CONFIG, | 708 | return dmaengine_device_control(chan, DMA_SLAVE_CONFIG, |
701 | (unsigned long)config); | 709 | (unsigned long)config); |
702 | } | 710 | } |