diff options
| author |   Peter Ujfalusi <peter.ujfalusi@ti.com> | 2019-08-30 13:38:40 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2019-08-30 12:22:46 +0100 |
| commit | 27b7def93aaba0838eb90e6b3c3110a856bb09fc (patch) | |
| tree | cf6f94229a55aac34b3759abb9de4c6064f5098a /sound | |
| parent | ASoC: ti: davinci-i2s: Add S32_LE as support format (diff) | |
| download | linux-dev-27b7def93aaba0838eb90e6b3c3110a856bb09fc.tar.xz linux-dev-27b7def93aaba0838eb90e6b3c3110a856bb09fc.zip | |
ASoC: ti: edma-pcm: Fix for legacy dma_slave_map based channel lookup
Most of the daVinci devices does not boot with DT. In this case the DMA
channel is looked up with dma_slave_map and for that the chan_names[]
must be configured.
Both McASP and ASP/McBSP uses "tx" and "rx" as channel names, so we can
just do this when the dev->of_node is not valid.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20190830103841.25128-4-peter.ujfalusi@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/ti/edma-pcm.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sound/soc/ti/edma-pcm.c b/sound/soc/ti/edma-pcm.c index 3ebea1bd15cb..634b040b65f0 100644 --- a/sound/soc/ti/edma-pcm.c +++ b/sound/soc/ti/edma-pcm.c @@ -39,7 +39,22 @@ static const struct snd_dmaengine_pcm_config edma_dmaengine_pcm_config = { int edma_pcm_platform_register(struct device *dev) { - return devm_snd_dmaengine_pcm_register(dev, &edma_dmaengine_pcm_config, 0); + struct snd_dmaengine_pcm_config *config; + + if (dev->of_node) + return devm_snd_dmaengine_pcm_register(dev, + &edma_dmaengine_pcm_config, 0); + + config = devm_kzalloc(dev, sizeof(*config), GFP_KERNEL); + if (!config) + return -ENOMEM; + + *config = edma_dmaengine_pcm_config; + + config->chan_names[0] = "tx"; + config->chan_names[1] = "rx"; + + return devm_snd_dmaengine_pcm_register(dev, config, 0); } EXPORT_SYMBOL_GPL(edma_pcm_platform_register); |