Skip to content

Commit 7f95581

Browse files
committed
Merge series "ASoC: Intel: boards: Remove ignore_suspend flag from SSP0 dai link" from Cezary Rojewski <[email protected]>:
As of commit: ASoC: soc-core: care .ignore_suspend for Component suspend function soc-core::snd_soc_suspend no longer ignores 'ignore_suspend' flag for dai links. While BE dai link for System Pin is supposed to follow standard suspend-resume flow, appended 'ignore_suspend' flag disturbs that flow and causes audio to break right after resume. Remove the flag to address this. Link to first message in conversation: https://lkml.org/lkml/2020/3/18/54 Cezary Rojewski (4): ASoC: Intel: broadwell: Remove ignore_suspend flag from SSP0 dai link ASoC: Intel: haswell: Remove ignore_suspend flag from SSP0 dai link ASoC: Intel: bdw-rt5677: Remove ignore_suspend flag from SSP0 dai link ASoC: Intel: bdw-rt5650: Remove ignore_suspend flag from SSP0 dai link sound/soc/intel/boards/bdw-rt5650.c | 1 - sound/soc/intel/boards/bdw-rt5677.c | 1 - sound/soc/intel/boards/broadwell.c | 1 - sound/soc/intel/boards/haswell.c | 1 - 4 files changed, 4 deletions(-) -- 2.17.1
2 parents 1ba616b + 793012c commit 7f95581

File tree

4 files changed

+0
-4
lines changed

4 files changed

+0
-4
lines changed

sound/soc/intel/boards/bdw-rt5650.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
254254
.no_pcm = 1,
255255
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |
256256
SND_SOC_DAIFMT_CBS_CFS,
257-
.ignore_suspend = 1,
258257
.ignore_pmdown_time = 1,
259258
.be_hw_params_fixup = broadwell_ssp0_fixup,
260259
.ops = &bdw_rt5650_ops,

sound/soc/intel/boards/bdw-rt5677.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
340340
.no_pcm = 1,
341341
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
342342
SND_SOC_DAIFMT_CBS_CFS,
343-
.ignore_suspend = 1,
344343
.ignore_pmdown_time = 1,
345344
.be_hw_params_fixup = broadwell_ssp0_fixup,
346345
.ops = &bdw_rt5677_ops,

sound/soc/intel/boards/broadwell.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
217217
.init = broadwell_rt286_codec_init,
218218
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
219219
SND_SOC_DAIFMT_CBS_CFS,
220-
.ignore_suspend = 1,
221220
.ignore_pmdown_time = 1,
222221
.be_hw_params_fixup = broadwell_ssp0_fixup,
223222
.ops = &broadwell_rt286_ops,

sound/soc/intel/boards/haswell.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = {
162162
.no_pcm = 1,
163163
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
164164
SND_SOC_DAIFMT_CBS_CFS,
165-
.ignore_suspend = 1,
166165
.ignore_pmdown_time = 1,
167166
.be_hw_params_fixup = haswell_ssp0_fixup,
168167
.ops = &haswell_rt5640_ops,

0 commit comments

Comments
 (0)