alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: yang.a.fang@intel.com
To: broonie@kernel.org, lgirdwood@gmail.com
Cc: alsa-devel@alsa-project.org, rohit.m.ainapure@intel.com,
	james.ausmus@intel.com, vinod.koul@intel.com,
	joe.konno@intel.com, yang.a.fang@intel.com,
	sathyanarayana.nujella@intel.com, jeeja.kp@intel.com,
	vedang.patel@intel.com, yong.zhi@intel.com
Subject: [PATCH 7/8] ASoc: Intel: boards: Add WOV as sink for nau88l25_ssm4567 machine
Date: Fri, 11 Dec 2015 11:29:12 -0800	[thread overview]
Message-ID: <1449862153-68738-7-git-send-email-yang.a.fang@intel.com> (raw)
In-Reply-To: <1449862153-68738-1-git-send-email-yang.a.fang@intel.com>

From: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>

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: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Fang, Yang A <yang.a.fang@intel.com>
Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
---
 sound/soc/intel/boards/skl_nau88l25_ssm4567.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
index 1b54613..f6c252c 100644
--- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
+++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
@@ -92,6 +92,7 @@ static const struct snd_soc_dapm_widget skylake_widgets[] = {
 	SND_SOC_DAPM_SPK("Left Speaker", NULL),
 	SND_SOC_DAPM_SPK("Right Speaker", 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,
 			platform_clock_control, SND_SOC_DAPM_PRE_PMU |
 			SND_SOC_DAPM_POST_PMD),
@@ -110,6 +111,7 @@ static const struct snd_soc_dapm_route skylake_map[] = {
 	{"MIC", NULL, "Headset Mic"},
 	{"DMic", NULL, "SoC DMIC"},
 
+	{"WoV Sink", NULL, "hwd_in sink"},
 	/* CODEC BE connections */
 	{ "Left 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);
 
 	snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");
+	snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "WoV Sink");
 
 	return ret;
 }
@@ -383,7 +386,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
 	},
 	{
 		.name = "Skl Audio Reference cap",
-		.stream_name = "refcap",
+		.stream_name = "Wake on Voice",
 		.cpu_dai_name = "Reference Pin",
 		.codec_name = "snd-soc-dummy",
 		.codec_dai_name = "snd-soc-dummy-dai",
-- 
1.7.9.5

  parent reply	other threads:[~2015-12-11 19:31 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-11 19:29 [PATCH 1/8] ASoC: max98357a: Add ACPI ID for Maxim yang.a.fang
2015-12-11 19:29 ` [PATCH 2/8] ASoC: Intel: Add Nuvoton+Maxim machine driver entry yang.a.fang
2015-12-18 12:15   ` Applied "ASoC: Intel: Add Nuvoton+Maxim machine driver entry" to the asoc tree Mark Brown
2015-12-11 19:29 ` [PATCH 3/8] ASoC: Intel: Skylake: Add Nuvoton Maxim machine driver yang.a.fang
2015-12-18 12:15   ` Applied "ASoC: Intel: Skylake: Add Nuvoton Maxim machine driver" to the asoc tree Mark Brown
2015-12-21  1:36   ` [PATCH 3/8] ASoC: Intel: Skylake: Add Nuvoton Maxim machine driver Anatol Pomozov
2015-12-21 18:18     ` Fang, Yang A
2015-12-11 19:29 ` [PATCH 4/8] ASoc: Intel: boards: fix dapm map of nau88l25_ssm4567 machine yang.a.fang
2015-12-18 12:15   ` Applied "ASoc: Intel: boards: fix dapm map of nau88l25_ssm4567 machine" to the asoc tree Mark Brown
2015-12-11 19:29 ` [PATCH 5/8] ASoc: Intel: boards: update ignore suspend for nau88l25_ssm4567 machine yang.a.fang
2015-12-18 12:15   ` Applied "ASoc: Intel: boards: update ignore suspend for nau88l25_ssm4567 machine" to the asoc tree Mark Brown
2015-12-11 19:29 ` [PATCH 6/8] ASoc: Intel: boards: update constraints for nau88l25_ssm4567 machine yang.a.fang
2015-12-18 12:15   ` Applied "ASoc: Intel: boards: update constraints for nau88l25_ssm4567 machine" to the asoc tree Mark Brown
2015-12-11 19:29 ` yang.a.fang [this message]
2015-12-18 12:15   ` Applied "ASoc: Intel: boards: Add WOV as sink " Mark Brown
2015-12-11 19:29 ` [PATCH 8/8] ASoc: Intel: boards: Add HDMI/DP links for nau88l25_ssm4567 machine yang.a.fang
2015-12-18 12:15   ` Applied "ASoc: Intel: boards: Add HDMI/DP links for nau88l25_ssm4567 machine" to the asoc tree Mark Brown
2015-12-18 12:15 ` Applied "ASoC: max98357a: Add ACPI ID for Maxim" " Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449862153-68738-7-git-send-email-yang.a.fang@intel.com \
    --to=yang.a.fang@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=james.ausmus@intel.com \
    --cc=jeeja.kp@intel.com \
    --cc=joe.konno@intel.com \
    --cc=lgirdwood@gmail.com \
    --cc=rohit.m.ainapure@intel.com \
    --cc=sathyanarayana.nujella@intel.com \
    --cc=vedang.patel@intel.com \
    --cc=vinod.koul@intel.com \
    --cc=yong.zhi@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).