diff options
author | Jeeja KP <jeeja.kp@intel.com> | 2016-02-24 00:57:44 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-02-24 03:29:47 -0500 |
commit | 8be3838af0e992846d4725fae152b818560c1068 (patch) | |
tree | ae7aa78e26cbbaf384baa3f6e098125b1db16f26 | |
parent | 98ee1745c81e9cf9553dd311524f9610331e784f (diff) |
ASoC: Intel: boards: Remove WoV sink in nau88125_max98357a 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_max98357a.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c index 33bf5286c948..72176b79a18d 100644 --- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c +++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c | |||
@@ -98,7 +98,6 @@ static const struct snd_soc_dapm_widget skylake_widgets[] = { | |||
98 | SND_SOC_DAPM_MIC("Headset Mic", NULL), | 98 | SND_SOC_DAPM_MIC("Headset Mic", NULL), |
99 | SND_SOC_DAPM_SPK("Spk", NULL), | 99 | SND_SOC_DAPM_SPK("Spk", NULL), |
100 | SND_SOC_DAPM_MIC("SoC DMIC", NULL), | 100 | SND_SOC_DAPM_MIC("SoC DMIC", NULL), |
101 | SND_SOC_DAPM_SINK("WoV Sink"), | ||
102 | SND_SOC_DAPM_SPK("DP", NULL), | 101 | SND_SOC_DAPM_SPK("DP", NULL), |
103 | SND_SOC_DAPM_SPK("HDMI", NULL), | 102 | SND_SOC_DAPM_SPK("HDMI", NULL), |
104 | SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0, | 103 | SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0, |
@@ -118,7 +117,6 @@ static const struct snd_soc_dapm_route skylake_map[] = { | |||
118 | { "MIC", NULL, "Headset Mic" }, | 117 | { "MIC", NULL, "Headset Mic" }, |
119 | { "DMic", NULL, "SoC DMIC" }, | 118 | { "DMic", NULL, "SoC DMIC" }, |
120 | 119 | ||
121 | {"WoV Sink", NULL, "hwd_in sink"}, | ||
122 | {"HDMI", NULL, "hif5 Output"}, | 120 | {"HDMI", NULL, "hif5 Output"}, |
123 | {"DP", NULL, "hif6 Output"}, | 121 | {"DP", NULL, "hif6 Output"}, |
124 | 122 | ||
@@ -188,7 +186,6 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) | |||
188 | nau8825_enable_jack_detect(codec, &skylake_headset); | 186 | nau8825_enable_jack_detect(codec, &skylake_headset); |
189 | 187 | ||
190 | snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC"); | 188 | snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC"); |
191 | snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "WoV Sink"); | ||
192 | 189 | ||
193 | return ret; | 190 | return ret; |
194 | } | 191 | } |