Merge tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / fsl / fsl_esai.c

diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index a857a624864fc0c05a2acf014d20c71b63380942..f356ae5925af001b5d2ac0c0ab96de314aa8a0a8 100644 (file)
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -304,7 +304,7 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
 
        if (IS_ERR(clksrc)) {
                dev_err(dai->dev, "no assigned %s clock\n",
-                               clk_id % 2 ? "extal" : "fsys");
+                       (clk_id % 2) ? "extal" : "fsys");
                return PTR_ERR(clksrc);
        }
        clk_rate = clk_get_rate(clksrc);
@@ -947,6 +947,9 @@ static const struct regmap_config fsl_esai_regmap_config = {
        .cache_type = REGCACHE_FLAT,
 };
 
+static int fsl_esai_runtime_resume(struct device *dev);
+static int fsl_esai_runtime_suspend(struct device *dev);
+
 static int fsl_esai_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
@@ -971,8 +974,7 @@ static int fsl_esai_probe(struct platform_device *pdev)
        if (IS_ERR(regs))
                return PTR_ERR(regs);
 
-       esai_priv->regmap = devm_regmap_init_mmio_clk(&pdev->dev,
-                       "core", regs, &fsl_esai_regmap_config);
+       esai_priv->regmap = devm_regmap_init_mmio(&pdev->dev, regs, &fsl_esai_regmap_config);
        if (IS_ERR(esai_priv->regmap)) {
                dev_err(&pdev->dev, "failed to init regmap: %ld\n",
                                PTR_ERR(esai_priv->regmap));
@@ -1041,11 +1043,23 @@ static int fsl_esai_probe(struct platform_device *pdev)
        }
 
        dev_set_drvdata(&pdev->dev, esai_priv);
-
        spin_lock_init(&esai_priv->lock);
+       pm_runtime_enable(&pdev->dev);
+       if (!pm_runtime_enabled(&pdev->dev)) {
+               ret = fsl_esai_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_esai_hw_init(esai_priv);
        if (ret)
-               return ret;
+               goto err_pm_get_sync;
 
        esai_priv->tx_mask = 0xFFFFFFFF;
        esai_priv->rx_mask = 0xFFFFFFFF;
@@ -1056,24 +1070,33 @@ static int fsl_esai_probe(struct platform_device *pdev)
        regmap_write(esai_priv->regmap, REG_ESAI_RSMA, 0);
        regmap_write(esai_priv->regmap, REG_ESAI_RSMB, 0);
 
+       ret = pm_runtime_put_sync(&pdev->dev);
+       if (ret < 0)
+               goto err_pm_get_sync;
+
        ret = devm_snd_soc_register_component(&pdev->dev, &fsl_esai_component,
                                              &fsl_esai_dai, 1);
        if (ret) {
                dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
-               return ret;
+               goto err_pm_get_sync;
        }
 
        INIT_WORK(&esai_priv->work, fsl_esai_hw_reset);
 
-       pm_runtime_enable(&pdev->dev);
-
-       regcache_cache_only(esai_priv->regmap, true);
-
        ret = imx_pcm_dma_init(pdev, IMX_ESAI_DMABUF_SIZE);
-       if (ret)
+       if (ret) {
                dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret);
+               goto err_pm_get_sync;
+       }
 
        return ret;
+
+err_pm_get_sync:
+       if (!pm_runtime_status_suspended(&pdev->dev))
+               fsl_esai_runtime_suspend(&pdev->dev);
+err_pm_disable:
+       pm_runtime_disable(&pdev->dev);
+       return ret;
 }
 
 static int fsl_esai_remove(struct platform_device *pdev)
@@ -1081,6 +1104,9 @@ static int fsl_esai_remove(struct platform_device *pdev)
        struct fsl_esai *esai_priv = platform_get_drvdata(pdev);
 
        pm_runtime_disable(&pdev->dev);
+       if (!pm_runtime_status_suspended(&pdev->dev))
+               fsl_esai_runtime_suspend(&pdev->dev);
+
        cancel_work_sync(&esai_priv->work);
 
        return 0;
@@ -1094,7 +1120,6 @@ static const struct of_device_id fsl_esai_dt_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, fsl_esai_dt_ids);
 
-#ifdef CONFIG_PM
 static int fsl_esai_runtime_resume(struct device *dev)
 {
        struct fsl_esai *esai = dev_get_drvdata(dev);
@@ -1162,7 +1187,6 @@ static int fsl_esai_runtime_suspend(struct device *dev)
 
        return 0;
 }
-#endif /* CONFIG_PM */
 
 static const struct dev_pm_ops fsl_esai_pm_ops = {
        SET_RUNTIME_PM_OPS(fsl_esai_runtime_suspend,