Skip to contentSkip to conversation

ASoC: Intel: Skylake: Update the IVI feedback path

PATCH In review Vinod Koul 2 participants 7 messages Mar 1, 2016 – Mar 2, 2016

Subsystems (3)
lore
Share & tools
lore

Vinod Koul

author
#0 lore raw

cover ASoC: Intel: Skylake: Update the IVI feedback path

This patch series fixes the blob query direction and then uses that in IVI feedback path in nau88125_ssm4567 machine.

Jeeja KP (3):
ASoC: Intel: Skylake: correct direction in blob query
ASoC: Intel: Skylake: Add IVI feedback path in nau88125_ssm4567 machine
ASoC: Intel: Skylake: remove IVI codec loop in skl_nau88l25_ssm4567
machine

 sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 21 +++------------------
 sound/soc/intel/skylake/skl-topology.c        | 15 ++++++++-------
 2 files changed, 11 insertions(+), 25 deletions(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/3 ASoC: Intel: Skylake: correct direction in blob query

From: Jeeja KP <[email protected]>

The blob query for BE skl_tplg_update_be_blob() was not using right values for direction for blob query, so fix that.

---
 sound/soc/intel/skylake/skl-topology.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
sound/soc/intel/skylake/skl-topology.c +8 -7
index c95bbce8ad5d..af7722ab7207 100644
@@ -273,10 +273,11 @@ static int skl_tplg_update_be_blob(struct snd_soc_dapm_widget *w,
 	if (m_cfg->formats_config.caps_size > 0)
 		return 0;
 
+	dev_dbg(ctx->dev, "Applying default cfg blob\n");
 	switch (m_cfg->dev_type) {
 	case SKL_DEVICE_DMIC:
 		link_type = NHLT_LINK_DMIC;
-		dir = 1;
+		dir = SNDRV_PCM_STREAM_CAPTURE;
 		s_freq = m_cfg->in_fmt[0].s_freq;
 		s_fmt = m_cfg->in_fmt[0].bit_depth;
 		ch = m_cfg->in_fmt[0].channels;
@@ -285,15 +286,15 @@ static int skl_tplg_update_be_blob(struct snd_soc_dapm_widget *w,
 	case SKL_DEVICE_I2S:
 		link_type = NHLT_LINK_SSP;
 		if (m_cfg->hw_conn_type == SKL_CONN_SOURCE) {
-			dir = 1;
-			s_freq = m_cfg->in_fmt[0].s_freq;
-			s_fmt = m_cfg->in_fmt[0].bit_depth;
-			ch = m_cfg->in_fmt[0].channels;
-		} else {
-			dir = 0;
+			dir = SNDRV_PCM_STREAM_PLAYBACK;
 			s_freq = m_cfg->out_fmt[0].s_freq;
 			s_fmt = m_cfg->out_fmt[0].bit_depth;
 			ch = m_cfg->out_fmt[0].channels;
+		} else {
+			dir = SNDRV_PCM_STREAM_CAPTURE;
+			s_freq = m_cfg->in_fmt[0].s_freq;
+			s_fmt = m_cfg->in_fmt[0].bit_depth;
+			ch = m_cfg->in_fmt[0].channels;
 		}
 		break;
 
Signature · 1 line
1.9.1
maintainer
#2 lore raw

Applied "ASoC: Intel: Skylake: correct direction in blob query" to the asoc tree

The patch

ASoC: Intel: Skylake: correct direction in blob query

has been applied to the asoc tree at

git://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 c7c6c73604ed4018cf7c22575d336a448ef8ccf5 Mon Sep 17 00:00:00 2001

From: Jeeja KP <[email protected]>
Date: Tue, 1 Mar 2016 07:59:10 +0530
Subject: [PATCH] ASoC: Intel: Skylake: correct direction in blob query

The blob query for BE skl_tplg_update_be_blob() was not using right values for direction for blob query, so fix that.

---
 sound/soc/intel/skylake/skl-topology.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
sound/soc/intel/skylake/skl-topology.c +8 -7
index c95bbce8ad5d..af7722ab7207 100644
@@ -273,10 +273,11 @@ static int skl_tplg_update_be_blob(struct snd_soc_dapm_widget *w,
 	if (m_cfg->formats_config.caps_size > 0)
 		return 0;
 
+	dev_dbg(ctx->dev, "Applying default cfg blob\n");
 	switch (m_cfg->dev_type) {
 	case SKL_DEVICE_DMIC:
 		link_type = NHLT_LINK_DMIC;
-		dir = 1;
+		dir = SNDRV_PCM_STREAM_CAPTURE;
 		s_freq = m_cfg->in_fmt[0].s_freq;
 		s_fmt = m_cfg->in_fmt[0].bit_depth;
 		ch = m_cfg->in_fmt[0].channels;
@@ -285,15 +286,15 @@ static int skl_tplg_update_be_blob(struct snd_soc_dapm_widget *w,
 	case SKL_DEVICE_I2S:
 		link_type = NHLT_LINK_SSP;
 		if (m_cfg->hw_conn_type == SKL_CONN_SOURCE) {
-			dir = 1;
-			s_freq = m_cfg->in_fmt[0].s_freq;
-			s_fmt = m_cfg->in_fmt[0].bit_depth;
-			ch = m_cfg->in_fmt[0].channels;
-		} else {
-			dir = 0;
+			dir = SNDRV_PCM_STREAM_PLAYBACK;
 			s_freq = m_cfg->out_fmt[0].s_freq;
 			s_fmt = m_cfg->out_fmt[0].bit_depth;
 			ch = m_cfg->out_fmt[0].channels;
+		} else {
+			dir = SNDRV_PCM_STREAM_CAPTURE;
+			s_freq = m_cfg->in_fmt[0].s_freq;
+			s_fmt = m_cfg->in_fmt[0].bit_depth;
+			ch = m_cfg->in_fmt[0].channels;
 		}
 		break;
 
Signature · 1 line
2.7.0
author
#3 lore raw

PATCH 2/3 ASoC: Intel: Skylake: Add IVI feedback path in nau88125_ssm4567 machine

In reply to Vinod Koul

From: Jeeja KP <[email protected]>

We can enable the IVI feedback path by connecting Left/Right speaker sensors (codec) to ssp0 Rx (soc-dsp). This way aDSP gets feedback data from codec to DSP algorithms

---
 sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +3 -0
index a75c09343f84..f6a672c55be9 100644
@@ -132,6 +132,8 @@ static const struct snd_soc_dapm_route skylake_map[] = {
 
 	/* IV feedback path */
 	{ "codec0_lp_in", NULL, "ssp0 Rx"},
+	{ "ssp0 Rx", NULL, "Left Capture Sense" },
+	{ "ssp0 Rx", NULL, "Right Capture Sense" },
 
 	{ "Playback", NULL, "ssp1 Tx"},
 	{ "ssp1 Tx", NULL, "codec1_out"},
@@ -534,6 +536,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
 		.ignore_pmdown_time = 1,
 		.be_hw_params_fixup = skylake_ssp_fixup,
 		.dpcm_playback = 1,
+		.dpcm_capture = 1,
 	},
 	{
 		/* SSP1 - Codec */
Signature · 1 line
1.9.1
maintainer
#4 lore raw

Applied "ASoC: Intel: Skylake: Add IVI feedback path in nau88125_ssm4567 machine" to the asoc tree

The patch

ASoC: Intel: Skylake: Add IVI feedback path in nau88125_ssm4567 machine

has been applied to the asoc tree at

git://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 5188b95a60ce33d5445833f9b0a374a2ad3200f4 Mon Sep 17 00:00:00 2001

From: Jeeja KP <[email protected]>
Date: Tue, 1 Mar 2016 07:59:11 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Add IVI feedback path in
nau88125_ssm4567 machine

We can enable the IVI feedback path by connecting Left/Right speaker sensors (codec) to ssp0 Rx (soc-dsp). This way aDSP gets feedback data from codec to DSP algorithms

---
 sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +3 -0
index a75c09343f84..f6a672c55be9 100644
@@ -132,6 +132,8 @@ static const struct snd_soc_dapm_route skylake_map[] = {
 
 	/* IV feedback path */
 	{ "codec0_lp_in", NULL, "ssp0 Rx"},
+	{ "ssp0 Rx", NULL, "Left Capture Sense" },
+	{ "ssp0 Rx", NULL, "Right Capture Sense" },
 
 	{ "Playback", NULL, "ssp1 Tx"},
 	{ "ssp1 Tx", NULL, "codec1_out"},
@@ -534,6 +536,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
 		.ignore_pmdown_time = 1,
 		.be_hw_params_fixup = skylake_ssp_fixup,
 		.dpcm_playback = 1,
+		.dpcm_capture = 1,
 	},
 	{
 		/* SSP1 - Codec */
Signature · 1 line
2.7.0
author
#5 lore raw

PATCH 3/3 ASoC: Intel: Skylake: remove IVI codec loop in skl_nau88l25_ssm4567 machine

In reply to Vinod Koul

From: Jeeja KP <[email protected]>

The IVI loop is removed in skl_nau88l25_ssm4567 machine as we enable this path thru DAPM graph using the PCM device and not thru loop

---
 sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 18 ------------------
 1 file changed, 18 deletions(-)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +0 -18
index f6a672c55be9..5f1ca99ae9b0 100644
@@ -156,14 +156,6 @@ static const struct snd_soc_dapm_route skylake_map[] = {
 	{ "Headset Mic", NULL, "Platform Clock" },
 };
 
-static const struct snd_soc_pcm_stream skl_ssm4567_loop_params = {
-	.formats = SNDRV_PCM_FMTBIT_S24_LE,
-	.rate_min = 48000,
-	.rate_max = 48000,
-	.channels_min = 4,
-	.channels_max = 4,
-};
-
 static struct snd_soc_codec_conf ssm4567_codec_conf[] = {
 	{
 		.dev_name = "i2c-INT343B:00",
@@ -508,16 +500,6 @@ static struct snd_soc_dai_link skylake_dais[] = {
 		.nonatomic = 1,
 		.dynamic = 1,
 	},
-	/* Codec-codec link */
-	{
-		.name = "Skylake IV loop",
-		.stream_name = "SKL IV Loop",
-		.cpu_dai_name = "SSP0 Pin",
-		.platform_name = "0000:00:1f.3",
-		.codecs = ssm4567_codec_components,
-		.num_codecs = ARRAY_SIZE(ssm4567_codec_components),
-		.params = &skl_ssm4567_loop_params,
-	},
 
 	/* Back End DAI links */
 	{
Signature · 1 line
1.9.1
maintainer
#6 lore raw

Applied "ASoC: Intel: Skylake: remove IVI codec loop in skl_nau88l25_ssm4567 machine" to the asoc tree

The patch

ASoC: Intel: Skylake: remove IVI codec loop in skl_nau88l25_ssm4567 machine

has been applied to the asoc tree at

git://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 fdd69c57370dbd9f81072b14aaeb90d80ab0b2f9 Mon Sep 17 00:00:00 2001

From: Jeeja KP <[email protected]>
Date: Tue, 1 Mar 2016 07:59:12 +0530
Subject: [PATCH] ASoC: Intel: Skylake: remove IVI codec loop in
skl_nau88l25_ssm4567 machine

The IVI loop is removed in skl_nau88l25_ssm4567 machine as we enable this path thru DAPM graph using the PCM device and not thru loop

---
 sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 18 ------------------
 1 file changed, 18 deletions(-)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +0 -18
index f6a672c55be9..5f1ca99ae9b0 100644
@@ -156,14 +156,6 @@ static const struct snd_soc_dapm_route skylake_map[] = {
 	{ "Headset Mic", NULL, "Platform Clock" },
 };
 
-static const struct snd_soc_pcm_stream skl_ssm4567_loop_params = {
-	.formats = SNDRV_PCM_FMTBIT_S24_LE,
-	.rate_min = 48000,
-	.rate_max = 48000,
-	.channels_min = 4,
-	.channels_max = 4,
-};
-
 static struct snd_soc_codec_conf ssm4567_codec_conf[] = {
 	{
 		.dev_name = "i2c-INT343B:00",
@@ -508,16 +500,6 @@ static struct snd_soc_dai_link skylake_dais[] = {
 		.nonatomic = 1,
 		.dynamic = 1,
 	},
-	/* Codec-codec link */
-	{
-		.name = "Skylake IV loop",
-		.stream_name = "SKL IV Loop",
-		.cpu_dai_name = "SSP0 Pin",
-		.platform_name = "0000:00:1f.3",
-		.codecs = ssm4567_codec_components,
-		.num_codecs = ARRAY_SIZE(ssm4567_codec_components),
-		.params = &skl_ssm4567_loop_params,
-	},
 
 	/* Back End DAI links */
 	{
Signature · 1 line
2.7.0