Commit 94a73e30 authored by Maxime Ripard's avatar Maxime Ripard Committed by Vinod Koul

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: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent c4b54a64
...@@ -608,6 +608,8 @@ struct dma_tx_state { ...@@ -608,6 +608,8 @@ struct dma_tx_state {
* The function takes a buffer of size buf_len. The callback function will * The function takes a buffer of size buf_len. The callback function will
* be called after period_len bytes have been transferred. * be called after period_len bytes have been transferred.
* @device_prep_interleaved_dma: Transfer expression in a generic way. * @device_prep_interleaved_dma: Transfer expression in a generic way.
* @device_config: Pushes a new configuration to a channel, return 0 or an error
* code
* @device_control: manipulate all pending operations on a channel, returns * @device_control: manipulate all pending operations on a channel, returns
* zero or error code * zero or error code
* @device_tx_status: poll for transaction completion, the optional * @device_tx_status: poll for transaction completion, the optional
...@@ -674,6 +676,9 @@ struct dma_device { ...@@ -674,6 +676,9 @@ struct dma_device {
struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)( struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)(
struct dma_chan *chan, struct dma_interleaved_template *xt, struct dma_chan *chan, struct dma_interleaved_template *xt,
unsigned long flags); unsigned long flags);
int (*device_config)(struct dma_chan *chan,
struct dma_slave_config *config);
int (*device_control)(struct dma_chan *chan, enum dma_ctrl_cmd cmd, int (*device_control)(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
unsigned long arg); unsigned long arg);
...@@ -697,6 +702,9 @@ static inline int dmaengine_device_control(struct dma_chan *chan, ...@@ -697,6 +702,9 @@ static inline int dmaengine_device_control(struct dma_chan *chan,
static inline int dmaengine_slave_config(struct dma_chan *chan, static inline int dmaengine_slave_config(struct dma_chan *chan,
struct dma_slave_config *config) struct dma_slave_config *config)
{ {
if (chan->device->device_config)
return chan->device->device_config(chan, config);
return dmaengine_device_control(chan, DMA_SLAVE_CONFIG, return dmaengine_device_control(chan, DMA_SLAVE_CONFIG,
(unsigned long)config); (unsigned long)config);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment