ASoC: fsl_xcvr: move reset assert into runtime_resume

Move reset assert into runtime_resume since we
cannot rely on reset assert state when the device
is put out from suspend.

Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1613984990-5534-1-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c
index 6dd0a5fcd4556af99c1a631447db31d1ef930d1d..c01eb213ea56fe2f4d3b5bede1613ef3d2b7bd05 100644 (file)
--- a/sound/soc/fsl/fsl_xcvr.c
+++ b/sound/soc/fsl/fsl_xcvr.c
@@ -1243,10 +1243,6 @@ static __maybe_unused int fsl_xcvr_runtime_suspend(struct device *dev)
        if (ret < 0)
                dev_err(dev, "Failed to assert M0+ core: %d\n", ret);
 
-       ret = reset_control_assert(xcvr->reset);
-       if (ret < 0)
-               dev_err(dev, "Failed to assert M0+ reset: %d\n", ret);
-
        regcache_cache_only(xcvr->regmap, true);
 
        clk_disable_unprepare(xcvr->spba_clk);
@@ -1262,6 +1258,12 @@ static __maybe_unused int fsl_xcvr_runtime_resume(struct device *dev)
        struct fsl_xcvr *xcvr = dev_get_drvdata(dev);
        int ret;
 
+       ret = reset_control_assert(xcvr->reset);
+       if (ret < 0) {
+               dev_err(dev, "Failed to assert M0+ reset: %d\n", ret);
+               return ret;
+       }
+
        ret = clk_prepare_enable(xcvr->ipg_clk);
        if (ret) {
                dev_err(dev, "failed to start IPG clock.\n");