diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-02 13:01:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-02 13:01:52 +0000 |
| commit | 75aac8206006e70859930d356ccfe02543530c27 (patch) | |
| tree | 3d7581b0dd992da0661a1eea81737d427ac81eb4 /include/sound | |
| parent | 01ad154ea505aeda249a4db4140a276f3eae509b (diff) | |
| parent | 2b67f8ba41ac7acf01c8d5c742c713ead8b589cd (diff) | |
| download | linux-75aac8206006e70859930d356ccfe02543530c27.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/dmaengine_pcm.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index 15017311f2e9..eb73a3a39ec2 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -114,6 +114,10 @@ void snd_dmaengine_pcm_set_config_from_dai_data( * @compat_filter_fn: Will be used as the filter function when requesting a * channel for platforms which do not use devicetree. The filter parameter * will be the DAI's DMA data. + * @dma_dev: If set, request DMA channel on this device rather than the DAI + * device. + * @chan_names: If set, these custom DMA channel names will be requested at + * registration time. * @pcm_hardware: snd_pcm_hardware struct to be used for the PCM. * @prealloc_buffer_size: Size of the preallocated audio buffer. * @@ -130,6 +134,8 @@ struct snd_dmaengine_pcm_config { struct snd_soc_pcm_runtime *rtd, struct snd_pcm_substream *substream); dma_filter_fn compat_filter_fn; + struct device *dma_dev; + const char *chan_names[SNDRV_PCM_STREAM_LAST + 1]; const struct snd_pcm_hardware *pcm_hardware; unsigned int prealloc_buffer_size; @@ -140,6 +146,10 @@ int snd_dmaengine_pcm_register(struct device *dev, unsigned int flags); void snd_dmaengine_pcm_unregister(struct device *dev); +int devm_snd_dmaengine_pcm_register(struct device *dev, + const struct snd_dmaengine_pcm_config *config, + unsigned int flags); + int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config); |