Skip to contentSkip to conversation

ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field

PATCH In review Rander Wang 3 participants 3 messages Dec 18, 2018 – Dec 19, 2018

Subsystems (3)
Sound ASoC Intel ASoC drivers
lore
Share & tools
lore

Rander Wang

author
#0 lore raw

PATCH 1/1 ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field

For some reason this field was set to zero when all other drivers use .dynamic = 1 for front-ends. This change was tested on Dell XPS13 and has no impact with the existing legacy driver. The SOF driver also works with this change which enables it to override the fixed topology.

Signed-off-by Rander Wang <[email protected]>
---
 sound/soc/intel/boards/broadwell.c | 2 +-
 sound/soc/intel/boards/haswell.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/boards/broadwell.c +1 -1
index 68e6543e6cb0..99f2a0156ae8 100644
@@ -192,7 +192,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
 		.stream_name = "Loopback",
 		.cpu_dai_name = "Loopback Pin",
 		.platform_name = "haswell-pcm-audio",
-		.dynamic = 0,
+		.dynamic = 1,
 		.codec_name = "snd-soc-dummy",
 		.codec_dai_name = "snd-soc-dummy-dai",
 		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
sound/soc/intel/boards/haswell.c +1 -1
index eab1f439dd3f..a4022983a7ce 100644
@@ -146,7 +146,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = {
 		.stream_name = "Loopback",
 		.cpu_dai_name = "Loopback Pin",
 		.platform_name = "haswell-pcm-audio",
-		.dynamic = 0,
+		.dynamic = 1,
 		.codec_name = "snd-soc-dummy",
 		.codec_dai_name = "snd-soc-dummy-dai",
 		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
Signature · 1 line
2.14.1
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Rander Wang

For some reason this field was set to zero when all other drivers use .dynamic = 1 for front-ends. This change was tested on Dell XPS13 and has no impact with the existing legacy driver. The SOF driver also works with this change which enables it to override the fixed topology.

Signed-off-by Rander Wang <[email protected]>
Acked-by Pierre-Louis Bossart <[email protected]>

Note that this change is not needed for the bdw-rt5677 machine driver, the "Loopback" front-end is not exposed.

Quoted 31 lines
---
  sound/soc/intel/boards/broadwell.c | 2 +-
  sound/soc/intel/boards/haswell.c   | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/boards/broadwell.c +1 -1
index 68e6543e6cb0..99f2a0156ae8 100644
@@ -192,7 +192,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
  		.stream_name = "Loopback",
  		.cpu_dai_name = "Loopback Pin",
  		.platform_name = "haswell-pcm-audio",
-		.dynamic = 0,
+		.dynamic = 1,
  		.codec_name = "snd-soc-dummy",
  		.codec_dai_name = "snd-soc-dummy-dai",
  		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
sound/soc/intel/boards/haswell.c +1 -1
index eab1f439dd3f..a4022983a7ce 100644
@@ -146,7 +146,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = {
  		.stream_name = "Loopback",
  		.cpu_dai_name = "Loopback Pin",
  		.platform_name = "haswell-pcm-audio",
-		.dynamic = 0,
+		.dynamic = 1,
  		.codec_name = "snd-soc-dummy",
  		.codec_dai_name = "snd-soc-dummy-dai",
  		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
maintainer
#2 lore raw

Applied "ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field" to the asoc tree

In reply to Rander Wang

The patch

ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 1202a93dcdf991e80314c3002bcbd99a8e0b9a44 Mon Sep 17 00:00:00 2001

From: Rander Wang <[email protected]>
Date: Tue, 18 Dec 2018 16:24:54 +0800
Subject: [PATCH] ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic
field

For some reason this field was set to zero when all other drivers use .dynamic = 1 for front-ends. This change was tested on Dell XPS13 and has no impact with the existing legacy driver. The SOF driver also works with this change which enables it to override the fixed topology.

Signed-off-by Rander Wang <[email protected]>
Acked-by Pierre-Louis Bossart <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/intel/boards/broadwell.c | 2 +-
 sound/soc/intel/boards/haswell.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/boards/broadwell.c +1 -1
index 68e6543e6cb0..99f2a0156ae8 100644
@@ -192,7 +192,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
 		.stream_name = "Loopback",
 		.cpu_dai_name = "Loopback Pin",
 		.platform_name = "haswell-pcm-audio",
-		.dynamic = 0,
+		.dynamic = 1,
 		.codec_name = "snd-soc-dummy",
 		.codec_dai_name = "snd-soc-dummy-dai",
 		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
sound/soc/intel/boards/haswell.c +1 -1
index eab1f439dd3f..a4022983a7ce 100644
@@ -146,7 +146,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = {
 		.stream_name = "Loopback",
 		.cpu_dai_name = "Loopback Pin",
 		.platform_name = "haswell-pcm-audio",
-		.dynamic = 0,
+		.dynamic = 1,
 		.codec_name = "snd-soc-dummy",
 		.codec_dai_name = "snd-soc-dummy-dai",
 		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
Signature · 1 line
2.19.0.rc2