diff options
| author | Sylwester Nawrocki | 2016-07-21 20:03:50 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-07-21 20:18:17 +0200 |
| commit | 42a74e77471ea42e6ab44e5be16723ede72b9901 (patch) | |
| tree | 6be321ee4782af38a420aad1ccbd7e8fd83cb702 /sound/soc/samsung/i2s.c | |
| parent | ASoC: samsung: Fix error paths in the I2S driver's probe() (diff) | |
| download | kernel-qcow2-linux-42a74e77471ea42e6ab44e5be16723ede72b9901.tar.gz kernel-qcow2-linux-42a74e77471ea42e6ab44e5be16723ede72b9901.tar.xz kernel-qcow2-linux-42a74e77471ea42e6ab44e5be16723ede72b9901.zip | |
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/i2s.c')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 2bb35502b070..50635ee8ff20 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1244,7 +1244,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) return ret; return samsung_asoc_dma_platform_register(&pdev->dev, - sec_dai->filter); + sec_dai->filter, "tx-sec", NULL); } pri_dai = i2s_alloc_dai(pdev, false); @@ -1351,7 +1351,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) if (ret < 0) goto err_free_dai; - ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter); + ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter, + NULL, NULL); if (ret < 0) goto err_free_dai; |