[PATCH v3] ASoC: Intel: kbl: Modify map for Headset Playback to fix pop-noise

[PATCH v3] ASoC: Intel: kbl: Modify map for Headset Playback to fix pop-noise

[Naveen Manohar]

Patch fixes wrong path in commit 0b06122fc8d0 ("ASoC: Intel: kbl: Add
map for new DAIs for Multi-Playback & Echo Ref") which resulted in pop
noise.
Current topology for Headset results in unwanted pop noise, while
switching from spk->hs at the start of Headset Playback.
Hence re-introduced mixin-mixout dsp module in topology for headset
playback pipe to fix the regression.
And the corresponding modification for headset route is updated here.

Fixes: 0b06122fc8d0 ("ASoC: Intel: kbl: Add map for new DAIs for
Multi-Playback & Echo Ref")
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
---
v1->v2: updated commit message to suit the change more appropriately.
v2->v3: Added Fixes Tag as suggested to explain a regression fix.

 sound/soc/intel/boards/kbl_rt5663_max98927.c        | 2 +-
 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
index 6f9a8bc..6dcad0a 100644
--- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
@@ -101,7 +101,7 @@ enum {
 	{ "ssp0 Tx", NULL, "spk_out" },
 
 	{ "AIF Playback", NULL, "ssp1 Tx" },
-	{ "ssp1 Tx", NULL, "hs_out" },
+	{ "ssp1 Tx", NULL, "codec1_out" },
 
 	{ "hs_in", NULL, "ssp1 Rx" },
 	{ "ssp1 Rx", NULL, "AIF Capture" },
diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index 6072164..271ae3c 100644
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -109,7 +109,7 @@ enum {
 	{ "ssp0 Tx", NULL, "spk_out" },
 
 	{ "AIF Playback", NULL, "ssp1 Tx" },
-	{ "ssp1 Tx", NULL, "hs_out" },
+	{ "ssp1 Tx", NULL, "codec1_out" },
 
 	{ "hs_in", NULL, "ssp1 Rx" },
 	{ "ssp1 Rx", NULL, "AIF Capture" },
-- 
1.9.1

Re: [PATCH v3] ASoC: Intel: kbl: Modify map for Headset Playback to fix pop-noise

[Vinod Koul]

On Fri, Nov 03, 2017 at 07:15:02PM +0530, Naveen Manohar wrote:
> Patch fixes wrong path in commit 0b06122fc8d0 ("ASoC: Intel: kbl: Add
> map for new DAIs for Multi-Playback & Echo Ref") which resulted in pop
> noise.
> Current topology for Headset results in unwanted pop noise, while
> switching from spk->hs at the start of Headset Playback.
> Hence re-introduced mixin-mixout dsp module in topology for headset
> playback pipe to fix the regression.
> And the corresponding modification for headset route is updated here.
> 
> Fixes: 0b06122fc8d0 ("ASoC: Intel: kbl: Add map for new DAIs for
> Multi-Playback & Echo Ref")
> Signed-off-by: Naveen Manohar <naveen.m@intel.com>
> Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>

Acked-By: Vinod Koul <vinod.koul@intel.com>

-- 
~Vinod