Commit 651e9268 authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown

ASoC: ux500: Restore platform DAI assignments

This reverts commit f1013cde ("ASoC: ux500: drop platform DAI
assignments"), which seems to have been based on a misunderstanding and
prevents the platform driver callbacks from being made (e.g. to
preallocate DMA memory).

The real culprit for the warnings about attempts to create duplicate
procfs entries was commit 99b04f4c ("ASoC: add Component level
pcm_new/pcm_free" that broke PCM creation on systems that use more than
one platform component.

Fixes: f1013cde ("ASoC: ux500: drop platform DAI assignments")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable <stable@vger.kernel.org>	# 4.11
parent c641e5b2
...@@ -33,6 +33,7 @@ static struct snd_soc_dai_link mop500_dai_links[] = { ...@@ -33,6 +33,7 @@ static struct snd_soc_dai_link mop500_dai_links[] = {
.stream_name = "ab8500_0", .stream_name = "ab8500_0",
.cpu_dai_name = "ux500-msp-i2s.1", .cpu_dai_name = "ux500-msp-i2s.1",
.codec_dai_name = "ab8500-codec-dai.0", .codec_dai_name = "ab8500-codec-dai.0",
.platform_name = "ux500-msp-i2s.1",
.codec_name = "ab8500-codec.0", .codec_name = "ab8500-codec.0",
.init = mop500_ab8500_machine_init, .init = mop500_ab8500_machine_init,
.ops = mop500_ab8500_ops, .ops = mop500_ab8500_ops,
...@@ -42,6 +43,7 @@ static struct snd_soc_dai_link mop500_dai_links[] = { ...@@ -42,6 +43,7 @@ static struct snd_soc_dai_link mop500_dai_links[] = {
.stream_name = "ab8500_1", .stream_name = "ab8500_1",
.cpu_dai_name = "ux500-msp-i2s.3", .cpu_dai_name = "ux500-msp-i2s.3",
.codec_dai_name = "ab8500-codec-dai.1", .codec_dai_name = "ab8500-codec-dai.1",
.platform_name = "ux500-msp-i2s.3",
.codec_name = "ab8500-codec.0", .codec_name = "ab8500-codec.0",
.init = NULL, .init = NULL,
.ops = mop500_ab8500_ops, .ops = mop500_ab8500_ops,
...@@ -85,6 +87,8 @@ static int mop500_of_probe(struct platform_device *pdev, ...@@ -85,6 +87,8 @@ static int mop500_of_probe(struct platform_device *pdev,
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
mop500_dai_links[i].cpu_of_node = msp_np[i]; mop500_dai_links[i].cpu_of_node = msp_np[i];
mop500_dai_links[i].cpu_dai_name = NULL; mop500_dai_links[i].cpu_dai_name = NULL;
mop500_dai_links[i].platform_of_node = msp_np[i];
mop500_dai_links[i].platform_name = NULL;
mop500_dai_links[i].codec_of_node = codec_np; mop500_dai_links[i].codec_of_node = codec_np;
mop500_dai_links[i].codec_name = NULL; mop500_dai_links[i].codec_name = NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment