Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2154be36 authored by Sathyanarayana Nujella's avatar Sathyanarayana Nujella Committed by Mark Brown
Browse files

ASoc: Intel: boards: Add WOV as sink for nau88l25_ssm4567 machine 



We have WOV module which should act as DAPM sink, so add that and
its links.

Also rename the refcap to "Wake On Voice" as some user expect to
find this name

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarFang, Yang A <yang.a.fang@intel.com>
Signed-off-by: default avatarSathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2616e27e

sound/soc/intel/boards/skl_nau88l25_ssm4567.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -92,6 +92,7 @@ static const struct snd_soc_dapm_widget skylake_widgets[] = { 
	SND_SOC_DAPM_SPK("Left Speaker", NULL),

	SND_SOC_DAPM_SPK("Left Speaker", NULL),

	SND_SOC_DAPM_SPK("Right Speaker", NULL),

	SND_SOC_DAPM_SPK("Right Speaker", NULL),

	SND_SOC_DAPM_MIC("SoC DMIC", NULL),

	SND_SOC_DAPM_MIC("SoC DMIC", NULL),

	SND_SOC_DAPM_SINK("WoV Sink"),

	SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,

			platform_clock_control, SND_SOC_DAPM_PRE_PMU |

			platform_clock_control, SND_SOC_DAPM_PRE_PMU |

			SND_SOC_DAPM_POST_PMD),

			SND_SOC_DAPM_POST_PMD),
@@ -110,6 +111,7 @@ static const struct snd_soc_dapm_route skylake_map[] = { 
	{"MIC", NULL, "Headset Mic"},

	{"MIC", NULL, "Headset Mic"},

	{"DMic", NULL, "SoC DMIC"},

	{"DMic", NULL, "SoC DMIC"},





	{"WoV Sink", NULL, "hwd_in sink"},

	/* CODEC BE connections */

	/* CODEC BE connections */

	{ "Left Playback", NULL, "ssp0 Tx"},

	{ "Left Playback", NULL, "ssp0 Tx"},

	{ "Right Playback", NULL, "ssp0 Tx"},

	{ "Right Playback", NULL, "ssp0 Tx"},
@@ -188,6 +190,7 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) 
	nau8825_enable_jack_detect(codec, &skylake_headset);

	nau8825_enable_jack_detect(codec, &skylake_headset);





	snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");

	snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");

	snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "WoV Sink");





	return ret;

	return ret;

}

}
@@ -383,7 +386,7 @@ static struct snd_soc_dai_link skylake_dais[] = { 
	},

	},

	{

	{

		.name = "Skl Audio Reference cap",

		.name = "Skl Audio Reference cap",

		.stream_name = "refcap",

		.stream_name = "Wake on Voice",

		.cpu_dai_name = "Reference Pin",

		.cpu_dai_name = "Reference Pin",

		.codec_name = "snd-soc-dummy",

		.codec_name = "snd-soc-dummy",

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_dai_name = "snd-soc-dummy-dai",