aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong Zhi <yong.zhi@intel.com>2015-12-11 11:29:10 -0800
committerMark Brown <broonie@kernel.org>2015-12-18 08:29:02 +0000
commit941eee74563652f6cc363d8d62b3a9f4bfffdbe2 (patch)
tree8a7b5274565faafd76ea0ed94b679684d098ff4a
parent4c6ebc3ecdba9484de5249de406d6fcf725cda62 (diff)
downloadsound-unstable-941eee74563652f6cc363d8d62b3a9f4bfffdbe2.tar.gz
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 9c9ebb8d07342a..8aa821c6b10683 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)
nau8825_enable_jack_detect(codec, &skylake_headset);
+ snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");
+
return ret;
}
@@ -285,7 +287,6 @@ static struct snd_soc_dai_link skylake_dais[] = {
SND_SOC_DAIFMT_IB_NF |
SND_SOC_DAIFMT_CBS_CFS,
.init = skylake_ssm4567_codec_init,
- .ignore_suspend = 1,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp_fixup,
.dpcm_playback = 1,
@@ -302,7 +303,6 @@ static struct snd_soc_dai_link skylake_dais[] = {
.init = skylake_nau8825_codec_init,
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS,
- .ignore_suspend = 1,
.ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp_fixup,
.ops = &skylake_nau8825_ops,