Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1685880

[PATCH 2/2] Revert "ASoC: ux500: drop platform DAI assignments"

Show all headers | View raw

This reverts commit f1013cdeeeb9 ("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 99b04f4c4051 ("ASoC: add Component level
pcm_new/pcm_free" that broke PCM creation on systems that use more than
one platform component.

Fixes: f1013cdeeeb9 ("ASoC: ux500: drop platform DAI assignments")
Cc: stable <stable@vger.kernel.org>	# 4.11
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 sound/soc/ux500/mop500.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c
index b50f68a439ce..ba9fc099cf67 100644
--- a/sound/soc/ux500/mop500.c
+++ b/sound/soc/ux500/mop500.c
@@ -33,6 +33,7 @@ static struct snd_soc_dai_link mop500_dai_links[] = {
 		.stream_name = "ab8500_0",
 		.cpu_dai_name = "ux500-msp-i2s.1",
 		.codec_dai_name = "ab8500-codec-dai.0",
+		.platform_name = "ux500-msp-i2s.1",
 		.codec_name = "ab8500-codec.0",
 		.init = mop500_ab8500_machine_init,
 		.ops = mop500_ab8500_ops,
@@ -42,6 +43,7 @@ static struct snd_soc_dai_link mop500_dai_links[] = {
 		.stream_name = "ab8500_1",
 		.cpu_dai_name = "ux500-msp-i2s.3",
 		.codec_dai_name = "ab8500-codec-dai.1",
+		.platform_name = "ux500-msp-i2s.3",
 		.codec_name = "ab8500-codec.0",
 		.init = NULL,
 		.ops = mop500_ab8500_ops,
@@ -85,6 +87,8 @@ static int mop500_of_probe(struct platform_device *pdev,
 	for (i = 0; i < 2; i++) {
 		mop500_dai_links[i].cpu_of_node = msp_np[i];
 		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_name = NULL;
 	}
-- 
2.13.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] ASoC: fix pcm-creation regression Johan Hovold <johan@kernel.org> - 2017-07-12 18:00 +0200
  [PATCH 2/2] Revert "ASoC: ux500: drop platform DAI assignments" Johan Hovold <johan@kernel.org> - 2017-07-12 18:00 +0200
    Re: [PATCH 2/2] Revert "ASoC: ux500: drop platform DAI assignments" Linus Walleij <linus.walleij@linaro.org> - 2017-07-14 15:40 +0200
      Re: [PATCH 2/2] Revert "ASoC: ux500: drop platform DAI assignments" Johan Hovold <johan@kernel.org> - 2017-07-17 10:10 +0200
    Re: [PATCH 2/2] Revert "ASoC: ux500: drop platform DAI assignments" Mark Brown <broonie@kernel.org> - 2017-07-17 17:00 +0200
      Re: [PATCH 2/2] Revert "ASoC: ux500: drop platform DAI assignments" Johan Hovold <johan@kernel.org> - 2017-07-18 10:30 +0200
    Applied "ASoC: ux500: Restore platform DAI assignments" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-07-17 18:10 +0200
  Re: [PATCH 1/2] ASoC: fix pcm-creation regression Linus Walleij <linus.walleij@linaro.org> - 2017-07-14 15:40 +0200
    Re: [PATCH 1/2] ASoC: fix pcm-creation regression Johan Hovold <johan@kernel.org> - 2017-07-17 10:10 +0200
  Applied "ASoC: fix pcm-creation regression" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-07-17 18:10 +0200

csiph-web