diff options
author | Jeeja KP <jeeja.kp@intel.com> | 2016-02-24 00:57:43 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-02-24 03:29:47 -0500 |
commit | 98ee1745c81e9cf9553dd311524f9610331e784f (patch) | |
tree | 4a95333a78af8768af755ca580a56c91ef0e9988 | |
parent | aac5cc88b107c316fdd2846fdac777726b9f725d (diff) |
ASoC: Intel: boards: Remove WoV sink in nau88125_ssm4567 machine
WoV module needs to be triggered with PCM open, so remove this as
DAPM Sink and will be connected to FE
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c index 68caf24f9fbd..a75c09343f84 100644 --- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c +++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c | |||
@@ -103,7 +103,6 @@ static const struct snd_soc_dapm_widget skylake_widgets[] = { | |||
103 | SND_SOC_DAPM_SPK("Left Speaker", NULL), | 103 | SND_SOC_DAPM_SPK("Left Speaker", NULL), |
104 | SND_SOC_DAPM_SPK("Right Speaker", NULL), | 104 | SND_SOC_DAPM_SPK("Right Speaker", NULL), |
105 | SND_SOC_DAPM_MIC("SoC DMIC", NULL), | 105 | SND_SOC_DAPM_MIC("SoC DMIC", NULL), |
106 | SND_SOC_DAPM_SINK("WoV Sink"), | ||
107 | SND_SOC_DAPM_SPK("DP", NULL), | 106 | SND_SOC_DAPM_SPK("DP", NULL), |
108 | SND_SOC_DAPM_SPK("HDMI", NULL), | 107 | SND_SOC_DAPM_SPK("HDMI", NULL), |
109 | SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0, | 108 | SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0, |
@@ -124,8 +123,6 @@ static const struct snd_soc_dapm_route skylake_map[] = { | |||
124 | {"MIC", NULL, "Headset Mic"}, | 123 | {"MIC", NULL, "Headset Mic"}, |
125 | {"DMic", NULL, "SoC DMIC"}, | 124 | {"DMic", NULL, "SoC DMIC"}, |
126 | 125 | ||
127 | {"WoV Sink", NULL, "hwd_in sink"}, | ||
128 | |||
129 | {"HDMI", NULL, "hif5 Output"}, | 126 | {"HDMI", NULL, "hif5 Output"}, |
130 | {"DP", NULL, "hif6 Output"}, | 127 | {"DP", NULL, "hif6 Output"}, |
131 | /* CODEC BE connections */ | 128 | /* CODEC BE connections */ |
@@ -225,7 +222,6 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) | |||
225 | nau8825_enable_jack_detect(codec, &skylake_headset); | 222 | nau8825_enable_jack_detect(codec, &skylake_headset); |
226 | 223 | ||
227 | snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC"); | 224 | snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC"); |
228 | snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "WoV Sink"); | ||
229 | 225 | ||
230 | return ret; | 226 | return ret; |
231 | } | 227 | } |