mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-05-24 10:39:52 +00:00
ASoC: fsl_esai: Don't use devm_regmap_init_mmio_clk
When there is power domain bind with bus 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-2-git-send-email-shengjiu.wang@nxp.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
f89c0a87b4
commit
203773e393
1 changed files with 36 additions and 12 deletions
|
@ -945,6 +945,9 @@ static const struct regmap_config fsl_esai_regmap_config = {
|
||||||
.cache_type = REGCACHE_FLAT,
|
.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)
|
static int fsl_esai_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct device_node *np = pdev->dev.of_node;
|
struct device_node *np = pdev->dev.of_node;
|
||||||
|
@ -969,8 +972,7 @@ static int fsl_esai_probe(struct platform_device *pdev)
|
||||||
if (IS_ERR(regs))
|
if (IS_ERR(regs))
|
||||||
return PTR_ERR(regs);
|
return PTR_ERR(regs);
|
||||||
|
|
||||||
esai_priv->regmap = devm_regmap_init_mmio_clk(&pdev->dev,
|
esai_priv->regmap = devm_regmap_init_mmio(&pdev->dev, regs, &fsl_esai_regmap_config);
|
||||||
"core", regs, &fsl_esai_regmap_config);
|
|
||||||
if (IS_ERR(esai_priv->regmap)) {
|
if (IS_ERR(esai_priv->regmap)) {
|
||||||
dev_err(&pdev->dev, "failed to init regmap: %ld\n",
|
dev_err(&pdev->dev, "failed to init regmap: %ld\n",
|
||||||
PTR_ERR(esai_priv->regmap));
|
PTR_ERR(esai_priv->regmap));
|
||||||
|
@ -1039,11 +1041,23 @@ static int fsl_esai_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_set_drvdata(&pdev->dev, esai_priv);
|
dev_set_drvdata(&pdev->dev, esai_priv);
|
||||||
|
|
||||||
spin_lock_init(&esai_priv->lock);
|
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);
|
ret = fsl_esai_hw_init(esai_priv);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
goto err_pm_get_sync;
|
||||||
|
|
||||||
esai_priv->tx_mask = 0xFFFFFFFF;
|
esai_priv->tx_mask = 0xFFFFFFFF;
|
||||||
esai_priv->rx_mask = 0xFFFFFFFF;
|
esai_priv->rx_mask = 0xFFFFFFFF;
|
||||||
|
@ -1054,24 +1068,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_RSMA, 0);
|
||||||
regmap_write(esai_priv->regmap, REG_ESAI_RSMB, 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,
|
ret = devm_snd_soc_register_component(&pdev->dev, &fsl_esai_component,
|
||||||
&fsl_esai_dai, 1);
|
&fsl_esai_dai, 1);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(&pdev->dev, "failed to register DAI: %d\n", 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);
|
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);
|
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);
|
dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret);
|
||||||
|
goto err_pm_get_sync;
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
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)
|
static int fsl_esai_remove(struct platform_device *pdev)
|
||||||
|
@ -1079,6 +1102,9 @@ static int fsl_esai_remove(struct platform_device *pdev)
|
||||||
struct fsl_esai *esai_priv = platform_get_drvdata(pdev);
|
struct fsl_esai *esai_priv = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
pm_runtime_disable(&pdev->dev);
|
pm_runtime_disable(&pdev->dev);
|
||||||
|
if (!pm_runtime_status_suspended(&pdev->dev))
|
||||||
|
fsl_esai_runtime_suspend(&pdev->dev);
|
||||||
|
|
||||||
cancel_work_sync(&esai_priv->work);
|
cancel_work_sync(&esai_priv->work);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1092,7 +1118,6 @@ static const struct of_device_id fsl_esai_dt_ids[] = {
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, fsl_esai_dt_ids);
|
MODULE_DEVICE_TABLE(of, fsl_esai_dt_ids);
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
|
||||||
static int fsl_esai_runtime_resume(struct device *dev)
|
static int fsl_esai_runtime_resume(struct device *dev)
|
||||||
{
|
{
|
||||||
struct fsl_esai *esai = dev_get_drvdata(dev);
|
struct fsl_esai *esai = dev_get_drvdata(dev);
|
||||||
|
@ -1160,7 +1185,6 @@ static int fsl_esai_runtime_suspend(struct device *dev)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_PM */
|
|
||||||
|
|
||||||
static const struct dev_pm_ops fsl_esai_pm_ops = {
|
static const struct dev_pm_ops fsl_esai_pm_ops = {
|
||||||
SET_RUNTIME_PM_OPS(fsl_esai_runtime_suspend,
|
SET_RUNTIME_PM_OPS(fsl_esai_runtime_suspend,
|
||||||
|
|
Loading…
Add table
Reference in a new issue