diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2016-07-21 20:03:50 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-21 19:18:17 +0100 |
| commit | 42a74e77471ea42e6ab44e5be16723ede72b9901 (patch) | |
| tree | 6be321ee4782af38a420aad1ccbd7e8fd83cb702 /sound/soc/samsung/dma.h | |
| parent | 2b960386cb75bd332a132c44c9ec69bd1f3122d8 (diff) | |
ASoC: samsung: Specify DMA channels through struct snd_dmaengine_pcm_config
The DMA channel names are specified through struct snd_dmaengine_pcm_config
rather than using SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag when
booting with devicetree in order to properly support deferred probing.
Without this change the sound machine driver initialization can complete
successfully with unavailable DMA resources.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/samsung/dma.h')
| -rw-r--r-- | sound/soc/samsung/dma.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/samsung/dma.h b/sound/soc/samsung/dma.h index a7616cc9b39e..3830f297e0b6 100644 --- a/sound/soc/samsung/dma.h +++ b/sound/soc/samsung/dma.h @@ -26,7 +26,10 @@ struct s3c_dma_params { void samsung_asoc_init_dma_data(struct snd_soc_dai *dai, struct s3c_dma_params *playback, struct s3c_dma_params *capture); -int samsung_asoc_dma_platform_register(struct device *dev, - dma_filter_fn fn); - +/* + * @tx, @rx arguments can be NULL if the DMA channel names are "tx", "rx", + * otherwise actual DMA channel names must be passed to this function. + */ +int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter, + const char *tx, const char *rx); #endif |