diff options
| author | Zhu Yingjiang <yingjiang.zhu@linux.intel.com> | 2019-06-12 12:23:44 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-17 13:45:39 +0100 |
| commit | 9a50ee58b8b11300788d41cd1c0f370833424823 (patch) | |
| tree | b09c18768b4411344461774985a533ba4e282274 /sound/soc/sof | |
| parent | 13063a2ccf79d232889491105a7bd9d552e417fc (diff) | |
| download | linux-stable-9a50ee58b8b11300788d41cd1c0f370833424823.tar.gz linux-stable-9a50ee58b8b11300788d41cd1c0f370833424823.tar.bz2 linux-stable-9a50ee58b8b11300788d41cd1c0f370833424823.zip | |
ASoC: SOF: Intel: hda: use the defined stop chip in suspend
Unify suspend code by using SOF common function
hda_dsp_ctrl_stop_chip() which can handle both HDA
and non-HDA cases.
Signed-off-by: Zhu Yingjiang <yingjiang.zhu@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/intel/hda-dsp.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 883134d535b3..f2c5a12db930 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -311,15 +311,8 @@ static int hda_suspend(struct snd_sof_dev *sdev, int state) hda_dsp_ctrl_ppcap_enable(sdev, false); hda_dsp_ctrl_ppcap_int_enable(sdev, false); -#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) - /* disable hda bus irq and i/o */ - snd_hdac_bus_stop_chip(bus); -#else - /* disable hda bus irq */ - snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL, - SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN, - 0); -#endif + /* disable hda bus irq and streams */ + hda_dsp_ctrl_stop_chip(sdev); /* disable LP retention mode */ snd_sof_pci_update_bits(sdev, PCI_PGCTL, |