ASoC: SOF: Intel: hda: use snd_sof_dsp_core_power_up/down API

To implement common logic in SOF core, core power up/down flows should
use common SOF API and not directly use low-level platform specific
helper functions.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210128093850.1041387-2-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c
index 2b001151fe376c83b55066513a487f1524b0d8df..4fe4175179d4ae41d5dadeba009281a08c2aa0b6 100644 (file)
--- a/sound/soc/sof/intel/hda-dsp.c
+++ b/sound/soc/sof/intel/hda-dsp.c
@@ -624,7 +624,7 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend)
 #endif
 
        /* power down DSP */
-       ret = hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);
+       ret = snd_sof_dsp_core_power_down(sdev, chip->host_managed_cores_mask);
        if (ret < 0) {
                dev_err(sdev->dev,
                        "error: failed to power down core during suspend\n");

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index 365a79fc708110ed98a62b0dc1d1295296cabed7..4b2ab351e2cc6adac07e9976ef571712a1f9eb37 100644 (file)
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -183,7 +183,7 @@ err:
                flags |= SOF_DBG_DUMP_FORCE_ERR_LEVEL;
 
        hda_dsp_dump(sdev, flags);
-       hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);
+       snd_sof_dsp_core_power_down(sdev, chip->host_managed_cores_mask);
 
        return ret;
 }

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 7e703ce22fcd3cd25eff3f4156c3e44351215b94..d57d484a42d136fea3119f803197e0927981e103 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -928,7 +928,7 @@ int hda_dsp_remove(struct snd_sof_dev *sdev)
 
        /* disable cores */
        if (chip)
-               hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);
+               snd_sof_dsp_core_power_down(sdev, chip->host_managed_cores_mask);
 
        /* disable DSP */
        snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,