diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-30 19:22:38 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-30 19:22:38 +0200 |
| commit | 7f95581187a2d5a401dc4a7b9428bb6c12db5b74 (patch) | |
| tree | d3a24a8f8d9b9248d6adc0f17226e4ff138b7a95 /sound/soc | |
| parent | ASoC: soc-dai: fix DAI startup/shutdown sequence (diff) | |
| parent | ASoC: Intel: bdw-rt5650: Remove ignore_suspend flag from SSP0 dai link (diff) | |
| download | linux-7f95581187a2d5a401dc4a7b9428bb6c12db5b74.tar.xz linux-7f95581187a2d5a401dc4a7b9428bb6c12db5b74.zip | |
Merge series "ASoC: Intel: boards: Remove ignore_suspend flag from SSP0 dai link" from Cezary Rojewski <cezary.rojewski@intel.com>:
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
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/intel/boards/bdw-rt5650.c | 1 | ||||
| -rw-r--r-- | sound/soc/intel/boards/bdw-rt5677.c | 1 | ||||
| -rw-r--r-- | sound/soc/intel/boards/broadwell.c | 1 | ||||
| -rw-r--r-- | sound/soc/intel/boards/haswell.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c index 6c2fdb5659ed..af2f50293208 100644 --- a/sound/soc/intel/boards/bdw-rt5650.c +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -254,7 +254,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { .no_pcm = 1, .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .ignore_suspend = 1, .ignore_pmdown_time = 1, .be_hw_params_fixup = broadwell_ssp0_fixup, .ops = &bdw_rt5650_ops, diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index 6b4b64098d36..cc41a348295e 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -340,7 +340,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { .no_pcm = 1, .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 = broadwell_ssp0_fixup, .ops = &bdw_rt5677_ops, diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c index acb4e36682cb..f9a8336a0541 100644 --- a/sound/soc/intel/boards/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -217,7 +217,6 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { .init = broadwell_rt286_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 = broadwell_ssp0_fixup, .ops = &broadwell_rt286_ops, diff --git a/sound/soc/intel/boards/haswell.c b/sound/soc/intel/boards/haswell.c index 3ed53d7db4e6..74af090f2657 100644 --- a/sound/soc/intel/boards/haswell.c +++ b/sound/soc/intel/boards/haswell.c @@ -162,7 +162,6 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = { .no_pcm = 1, .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 = haswell_ssp0_fixup, .ops = &haswell_rt5640_ops, |