ASoC: fsl_asrc: Don't use devm_regmap_init_mmio_clk

When there is power domain bind with mem clock,

The call flow:
devm_regmap_init_mmio_clk
   - clk_prepare()
       - clk_pm_runtime_get()

cause the power domain of clock always be enabled after
regmap_init(). which impact the power consumption.

So use devm_regmap_init_mmio instead of
devm_regmap_init_mmio_clk,but explicitly enable
clock when it is used.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1616579928-22428-4-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
index 63d236ef5c4d42f5e7e3ed06288df6e75b7f1d26..0e1ad8efebd3838bd9412161b979d350e665ce5b 100644 (file)
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
@@ -1008,6 +1008,9 @@ static int fsl_asrc_get_fifo_addr(u8 dir, enum asrc_pair_index index)
        return REG_ASRDx(dir, index);
 }
 
+static int fsl_asrc_runtime_resume(struct device *dev);
+static int fsl_asrc_runtime_suspend(struct device *dev);
+
 static int fsl_asrc_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
@@ -1039,8 +1042,7 @@ static int fsl_asrc_probe(struct platform_device *pdev)
 
        asrc->paddr = res->start;
 
-       asrc->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "mem", regs,
-                                                &fsl_asrc_regmap_config);
+       asrc->regmap = devm_regmap_init_mmio(&pdev->dev, regs, &fsl_asrc_regmap_config);
        if (IS_ERR(asrc->regmap)) {
                dev_err(&pdev->dev, "failed to init regmap\n");
                return PTR_ERR(asrc->regmap);
@@ -1117,12 +1119,6 @@ static int fsl_asrc_probe(struct platform_device *pdev)
                }
        }
 
-       ret = fsl_asrc_init(asrc);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to init asrc %d\n", ret);
-               return ret;
-       }
-
        asrc->channel_avail = 10;
 
        ret = of_property_read_u32(np, "fsl,asrc-rate",
@@ -1161,21 +1157,56 @@ static int fsl_asrc_probe(struct platform_device *pdev)
        }
 
        platform_set_drvdata(pdev, asrc);
-       pm_runtime_enable(&pdev->dev);
        spin_lock_init(&asrc->lock);
-       regcache_cache_only(asrc->regmap, true);
+       pm_runtime_enable(&pdev->dev);
+       if (!pm_runtime_enabled(&pdev->dev)) {
+               ret = fsl_asrc_runtime_resume(&pdev->dev);
+               if (ret)
+                       goto err_pm_disable;
+       }
+
+       ret = pm_runtime_get_sync(&pdev->dev);
+       if (ret < 0) {
+               pm_runtime_put_noidle(&pdev->dev);
+               goto err_pm_get_sync;
+       }
+
+       ret = fsl_asrc_init(asrc);
+       if (ret) {
+               dev_err(&pdev->dev, "failed to init asrc %d\n", ret);
+               goto err_pm_get_sync;
+       }
+
+       ret = pm_runtime_put_sync(&pdev->dev);
+       if (ret < 0)
+               goto err_pm_get_sync;
 
        ret = devm_snd_soc_register_component(&pdev->dev, &fsl_asrc_component,
                                              &fsl_asrc_dai, 1);
        if (ret) {
                dev_err(&pdev->dev, "failed to register ASoC DAI\n");
-               return ret;
+               goto err_pm_get_sync;
        }
 
        return 0;
+
+err_pm_get_sync:
+       if (!pm_runtime_status_suspended(&pdev->dev))
+               fsl_asrc_runtime_suspend(&pdev->dev);
+err_pm_disable:
+       pm_runtime_disable(&pdev->dev);
+       return ret;
+}
+
+static int fsl_asrc_remove(struct platform_device *pdev)
+{
+       pm_runtime_disable(&pdev->dev);
+       if (!pm_runtime_status_suspended(&pdev->dev))
+               fsl_asrc_runtime_suspend(&pdev->dev);
+
+       return 0;
 }
 
-#ifdef CONFIG_PM
 static int fsl_asrc_runtime_resume(struct device *dev)
 {
        struct fsl_asrc *asrc = dev_get_drvdata(dev);
@@ -1252,7 +1283,6 @@ static int fsl_asrc_runtime_suspend(struct device *dev)
 
        return 0;
 }
-#endif /* CONFIG_PM */
 
 static const struct dev_pm_ops fsl_asrc_pm = {
        SET_RUNTIME_PM_OPS(fsl_asrc_runtime_suspend, fsl_asrc_runtime_resume, NULL)
@@ -1291,6 +1321,7 @@ MODULE_DEVICE_TABLE(of, fsl_asrc_ids);
 
 static struct platform_driver fsl_asrc_driver = {
        .probe = fsl_asrc_probe,
+       .remove = fsl_asrc_remove,
        .driver = {
                .name = "fsl-asrc",
                .of_match_table = fsl_asrc_ids,