Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 941eee74 authored by Yong Zhi's avatar Yong Zhi Committed by Mark Brown
Browse files

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: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarYong Zhi <yong.zhi@intel.com>
Signed-off-by: default avatarFang, Yang A <yang.a.fang@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4c6ebc3e

sound/soc/intel/boards/skl_nau88l25_ssm4567.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -187,6 +187,8 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) 




	nau8825_enable_jack_detect(codec, &skylake_headset);

	nau8825_enable_jack_detect(codec, &skylake_headset);





	snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");



	return ret;

	return ret;

}

}
@@ -285,7 +287,6 @@ static struct snd_soc_dai_link skylake_dais[] = { 
			SND_SOC_DAIFMT_IB_NF |

			SND_SOC_DAIFMT_IB_NF |

			SND_SOC_DAIFMT_CBS_CFS,

			SND_SOC_DAIFMT_CBS_CFS,

		.init = skylake_ssm4567_codec_init,

		.init = skylake_ssm4567_codec_init,

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.ignore_pmdown_time = 1,

		.be_hw_params_fixup = skylake_ssp_fixup,

		.be_hw_params_fixup = skylake_ssp_fixup,

		.dpcm_playback = 1,

		.dpcm_playback = 1,
@@ -302,7 +303,6 @@ static struct snd_soc_dai_link skylake_dais[] = { 
		.init = skylake_nau8825_codec_init,

		.init = skylake_nau8825_codec_init,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS,

			SND_SOC_DAIFMT_CBS_CFS,

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.ignore_pmdown_time = 1,

		.be_hw_params_fixup = skylake_ssp_fixup,

		.be_hw_params_fixup = skylake_ssp_fixup,

		.ops = &skylake_nau8825_ops,

		.ops = &skylake_nau8825_ops,