ASoC: SOF: reset default d0_substate at probe() and resume()

We initialize/reset d0_substate to default d0i0 value when doing
transition D3-->D0, e.g. at success of probing and resuming.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191025224122.7718-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 5998861a90029353e752946d50951e46970dcd5b..8661c2cca76b9ab7d8923b34a791c66b128f62cd 100644 (file)
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -458,6 +458,9 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data)
        /* initialize sof device */
        sdev->dev = dev;
 
+       /* initialize default D0 sub-state */
+       sdev->d0_substate = SOF_DSP_D0I0;
+
        sdev->pdata = plat_data;
        sdev->first_boot = true;
        dev_set_drvdata(dev, sdev);

diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c
index e23beaeefe0054a69b27ae97866d1ace4a04a351..81e623dfc7e52b7b6357fd7ba259c38426aec24a 100644 (file)
--- a/sound/soc/sof/pm.c
+++ b/sound/soc/sof/pm.c
@@ -326,6 +326,9 @@ static int sof_resume(struct device *dev, bool runtime_resume)
                        "error: ctx_restore ipc error during resume %d\n",
                        ret);
 
+       /* initialize default D0 sub-state */
+       sdev->d0_substate = SOF_DSP_D0I0;
+
        return ret;
 }