From 790ac51a9d078df1d2e925f4f26fae4cd6b35d7d Mon Sep 17 00:00:00 2001 From: Songhee Baek Date: Thu, 24 Apr 2014 17:48:10 -0700 Subject: [PATCH] ASoC: tegra_alt: Use DMA channel name from DT This change is to use DMA channel name from DT when pcm driver requests the dma channel to dma engine. Bug 1488342 Change-Id: I4b2518ce14caa366b834848571577273c4144ac6 Signed-off-by: Songhee Baek Reviewed-on: http://git-master/r/401167 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Tested-by: Sumit Bhattacharya Reviewed-by: Sumit Bhattacharya --- sound/soc/tegra-alt/tegra210_admaif_alt.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sound/soc/tegra-alt/tegra210_admaif_alt.c b/sound/soc/tegra-alt/tegra210_admaif_alt.c index d343ae5f..8265b85f 100644 --- a/sound/soc/tegra-alt/tegra210_admaif_alt.c +++ b/sound/soc/tegra-alt/tegra210_admaif_alt.c @@ -526,10 +526,28 @@ static int tegra210_admaif_probe(struct platform_device *pdev) admaif->playback_dma_data[i].wrap = 4; admaif->playback_dma_data[i].width = 32; admaif->playback_dma_data[i].req_sel = i + 1; + if (of_property_read_string_index(pdev->dev.of_node, + "dma-names", + (i * 2) + 1, + &admaif->playback_dma_data[i].chan_name) < 0) { + dev_err(&pdev->dev, + "Missing property nvidia,dma-names\n"); + ret = -ENODEV; + goto err_suspend; + } admaif->capture_dma_data[i].wrap = 4; admaif->capture_dma_data[i].width = 32; admaif->capture_dma_data[i].req_sel = i + 1; + if (of_property_read_string_index(pdev->dev.of_node, + "dma-names", + (i * 2), + &admaif->capture_dma_data[i].chan_name) < 0) { + dev_err(&pdev->dev, + "Missing property nvidia,dma-names\n"); + ret = -ENODEV; + goto err_suspend; + } } ret = snd_soc_register_component(&pdev->dev,