diff options
| author | Mark Brown <broonie@kernel.org> | 2017-02-19 17:35:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-02-19 17:35:44 +0100 |
| commit | c7bb6d8060eec4f3806b88796fbf46db1e73d900 (patch) | |
| tree | d5cb74ddd14ac57738537fe373fd4faef02a5607 /include | |
| parent | Merge remote-tracking branch 'asoc/topic/component' into asoc-next (diff) | |
| parent | ASoC: Revert "Drop SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag" (diff) | |
| download | linux-c7bb6d8060eec4f3806b88796fbf46db1e73d900.tar.xz linux-c7bb6d8060eec4f3806b88796fbf46db1e73d900.zip | |
Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/dmaengine_pcm.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index 1c8f9e1ef2a5..67be2445941a 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -71,6 +71,7 @@ struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream) * @slave_id: Slave requester id for the DMA channel. * @filter_data: Custom DMA channel filter data, this will usually be used when * requesting the DMA channel. + * @chan_name: Custom channel name to use when requesting DMA channel. * @fifo_size: FIFO size of the DAI controller in bytes * @flags: PCM_DAI flags, only SND_DMAENGINE_PCM_DAI_FLAG_PACK for now */ @@ -80,6 +81,7 @@ struct snd_dmaengine_dai_dma_data { u32 maxburst; unsigned int slave_id; void *filter_data; + const char *chan_name; unsigned int fifo_size; unsigned int flags; }; @@ -105,6 +107,10 @@ void snd_dmaengine_pcm_set_config_from_dai_data( * playback. */ #define SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX BIT(3) +/* + * The PCM streams have custom channel names specified. + */ +#define SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME BIT(4) /** * struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM |