aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong Zhi <yong.zhi@intel.com>2015-12-11 14:29:10 -0500
committerMark Brown <broonie@kernel.org>2015-12-18 03:29:02 -0500
commit941eee74563652f6cc363d8d62b3a9f4bfffdbe2 (patch)
tree8a7b5274565faafd76ea0ed94b679684d098ff4a
parent4c6ebc3ecdba9484de5249de406d6fcf725cda62 (diff)
ASoc: Intel: boards: update ignore suspend for nau88l25_ssm4567 machine
We don't support ignore suspend on few devices so remove that. Also since we support ignore susend on PDM DMIC, add that Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Yong Zhi <yong.zhi@intel.com> Signed-off-by: Fang, Yang A <yang.a.fang@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/intel/boards/skl_nau88l25_ssm4567.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
index 9c9ebb8d0734..8aa821c6b106 100644
--- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
+++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
@@ -187,6 +187,8 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)
187 187
188 nau8825_enable_jack_detect(codec, &skylake_headset); 188 nau8825_enable_jack_detect(codec, &skylake_headset);
189 189
190 snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");
191
190 return ret; 192 return ret;
191} 193}
192 194
@@ -285,7 +287,6 @@ static struct snd_soc_dai_link skylake_dais[] = {
285 SND_SOC_DAIFMT_IB_NF | 287 SND_SOC_DAIFMT_IB_NF |
286 SND_SOC_DAIFMT_CBS_CFS, 288 SND_SOC_DAIFMT_CBS_CFS,
287 .init = skylake_ssm4567_codec_init, 289 .init = skylake_ssm4567_codec_init,
288 .ignore_suspend = 1,
289 .ignore_pmdown_time = 1, 290 .ignore_pmdown_time = 1,
290 .be_hw_params_fixup = skylake_ssp_fixup, 291 .be_hw_params_fixup = skylake_ssp_fixup,
291 .dpcm_playback = 1, 292 .dpcm_playback = 1,
@@ -302,7 +303,6 @@ static struct snd_soc_dai_link skylake_dais[] = {
302 .init = skylake_nau8825_codec_init, 303 .init = skylake_nau8825_codec_init,
303 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | 304 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
304 SND_SOC_DAIFMT_CBS_CFS, 305 SND_SOC_DAIFMT_CBS_CFS,
305 .ignore_suspend = 1,
306 .ignore_pmdown_time = 1, 306 .ignore_pmdown_time = 1,
307 .be_hw_params_fixup = skylake_ssp_fixup, 307 .be_hw_params_fixup = skylake_ssp_fixup,
308 .ops = &skylake_nau8825_ops, 308 .ops = &skylake_nau8825_ops,