diff options
| author | Mark Brown <broonie@kernel.org> | 2019-10-02 14:50:40 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-02 14:50:40 +0300 |
| commit | 25317997cbcd0497a9460f79c322e0fde0b5b1a9 (patch) | |
| tree | 215512440bd5a9ce931789d7c0f24d47e7c5d572 /sound/soc/sof/intel/hda-ctrl.c | |
| parent | 3a9e204d4e36904a464a2e53206b053a7ffc7bad (diff) | |
| parent | 2bdf194e2030fce4f2e91300817338353414ab3b (diff) | |
| download | linux-25317997cbcd0497a9460f79c322e0fde0b5b1a9.tar.xz | |
Merge branch 'asoc-5.4' into asoc-5.5
Diffstat (limited to 'sound/soc/sof/intel/hda-ctrl.c')
| -rw-r--r-- | sound/soc/sof/intel/hda-ctrl.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/soc/sof/intel/hda-ctrl.c b/sound/soc/sof/intel/hda-ctrl.c index bc41028a7a01..df1909e1d950 100644 --- a/sound/soc/sof/intel/hda-ctrl.c +++ b/sound/soc/sof/intel/hda-ctrl.c @@ -139,20 +139,16 @@ void hda_dsp_ctrl_misc_clock_gating(struct snd_sof_dev *sdev, bool enable) */ int hda_dsp_ctrl_clock_power_gating(struct snd_sof_dev *sdev, bool enable) { -#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) - struct hdac_bus *bus = sof_to_bus(sdev); -#endif u32 val; /* enable/disable audio dsp clock gating */ val = enable ? PCI_CGCTL_ADSPDCGE : 0; snd_sof_pci_update_bits(sdev, PCI_CGCTL, PCI_CGCTL_ADSPDCGE, val); -#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) - /* enable/disable L1 support */ - val = enable ? SOF_HDA_VS_EM2_L1SEN : 0; - snd_hdac_chip_updatel(bus, VS_EM2, SOF_HDA_VS_EM2_L1SEN, val); -#endif + /* enable/disable DMI Link L1 support */ + val = enable ? HDA_VS_INTEL_EM2_L1SEN : 0; + snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, HDA_VS_INTEL_EM2, + HDA_VS_INTEL_EM2_L1SEN, val); /* enable/disable audio dsp power gating */ val = enable ? 0 : PCI_PGCTL_ADSPPGD; |