Commit 1fac824f authored by Ed Blake's avatar Ed Blake Committed by Mark Brown

ASoC: img-spdif-in: Add runtime PM

Add runtime PM to disable the clock when the device is not in use.
The ASoC core takes care of the pm_runtime_get_sync / put calls so we
just need to provide runtime_suspend / runtime_resume functions and
enable runtime PM.
Signed-off-by: default avatarEd Blake <ed.blake@sondrel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 52eb0ed3
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <sound/core.h> #include <sound/core.h>
...@@ -89,6 +90,29 @@ struct img_spdif_in { ...@@ -89,6 +90,29 @@ struct img_spdif_in {
unsigned int aclkgen_regs[IMG_SPDIF_IN_NUM_ACLKGEN]; unsigned int aclkgen_regs[IMG_SPDIF_IN_NUM_ACLKGEN];
}; };
static int img_spdif_in_runtime_suspend(struct device *dev)
{
struct img_spdif_in *spdif = dev_get_drvdata(dev);
clk_disable_unprepare(spdif->clk_sys);
return 0;
}
static int img_spdif_in_runtime_resume(struct device *dev)
{
struct img_spdif_in *spdif = dev_get_drvdata(dev);
int ret;
ret = clk_prepare_enable(spdif->clk_sys);
if (ret) {
dev_err(dev, "Unable to enable sys clock\n");
return ret;
}
return 0;
}
static inline void img_spdif_in_writel(struct img_spdif_in *spdif, static inline void img_spdif_in_writel(struct img_spdif_in *spdif,
u32 val, u32 reg) u32 val, u32 reg)
{ {
...@@ -725,15 +749,21 @@ static int img_spdif_in_probe(struct platform_device *pdev) ...@@ -725,15 +749,21 @@ static int img_spdif_in_probe(struct platform_device *pdev)
return PTR_ERR(spdif->clk_sys); return PTR_ERR(spdif->clk_sys);
} }
ret = clk_prepare_enable(spdif->clk_sys); pm_runtime_enable(&pdev->dev);
if (ret) if (!pm_runtime_enabled(&pdev->dev)) {
return ret; ret = img_spdif_in_runtime_resume(&pdev->dev);
if (ret)
goto err_pm_disable;
}
ret = pm_runtime_get_sync(&pdev->dev);
if (ret < 0)
goto err_suspend;
rst = devm_reset_control_get_exclusive(&pdev->dev, "rst"); rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");
if (IS_ERR(rst)) { if (IS_ERR(rst)) {
if (PTR_ERR(rst) == -EPROBE_DEFER) { if (PTR_ERR(rst) == -EPROBE_DEFER) {
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
goto err_clk_disable; goto err_pm_put;
} }
dev_dbg(dev, "No top level reset found\n"); dev_dbg(dev, "No top level reset found\n");
img_spdif_in_writel(spdif, IMG_SPDIF_IN_SOFT_RESET_MASK, img_spdif_in_writel(spdif, IMG_SPDIF_IN_SOFT_RESET_MASK,
...@@ -761,28 +791,35 @@ static int img_spdif_in_probe(struct platform_device *pdev) ...@@ -761,28 +791,35 @@ static int img_spdif_in_probe(struct platform_device *pdev)
IMG_SPDIF_IN_CTL_TRK_MASK; IMG_SPDIF_IN_CTL_TRK_MASK;
img_spdif_in_writel(spdif, reg, IMG_SPDIF_IN_CTL); img_spdif_in_writel(spdif, reg, IMG_SPDIF_IN_CTL);
pm_runtime_put(&pdev->dev);
ret = devm_snd_soc_register_component(&pdev->dev, ret = devm_snd_soc_register_component(&pdev->dev,
&img_spdif_in_component, &img_spdif_in_dai, 1); &img_spdif_in_component, &img_spdif_in_dai, 1);
if (ret) if (ret)
goto err_clk_disable; goto err_suspend;
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) if (ret)
goto err_clk_disable; goto err_suspend;
return 0; return 0;
err_clk_disable: err_pm_put:
clk_disable_unprepare(spdif->clk_sys); pm_runtime_put(&pdev->dev);
err_suspend:
if (!pm_runtime_enabled(&pdev->dev))
img_spdif_in_runtime_suspend(&pdev->dev);
err_pm_disable:
pm_runtime_disable(&pdev->dev);
return ret; return ret;
} }
static int img_spdif_in_dev_remove(struct platform_device *pdev) static int img_spdif_in_dev_remove(struct platform_device *pdev)
{ {
struct img_spdif_in *spdif = platform_get_drvdata(pdev); pm_runtime_disable(&pdev->dev);
if (!pm_runtime_status_suspended(&pdev->dev))
clk_disable_unprepare(spdif->clk_sys); img_spdif_in_runtime_suspend(&pdev->dev);
return 0; return 0;
} }
...@@ -791,11 +828,18 @@ static int img_spdif_in_dev_remove(struct platform_device *pdev) ...@@ -791,11 +828,18 @@ static int img_spdif_in_dev_remove(struct platform_device *pdev)
static int img_spdif_in_suspend(struct device *dev) static int img_spdif_in_suspend(struct device *dev)
{ {
struct img_spdif_in *spdif = dev_get_drvdata(dev); struct img_spdif_in *spdif = dev_get_drvdata(dev);
int ret;
if (pm_runtime_status_suspended(dev)) {
ret = img_spdif_in_runtime_resume(dev);
if (ret)
return ret;
}
spdif->suspend_clkgen = img_spdif_in_readl(spdif, IMG_SPDIF_IN_CLKGEN); spdif->suspend_clkgen = img_spdif_in_readl(spdif, IMG_SPDIF_IN_CLKGEN);
spdif->suspend_ctl = img_spdif_in_readl(spdif, IMG_SPDIF_IN_CTL); spdif->suspend_ctl = img_spdif_in_readl(spdif, IMG_SPDIF_IN_CTL);
clk_disable_unprepare(spdif->clk_sys); img_spdif_in_runtime_suspend(dev);
return 0; return 0;
} }
...@@ -803,9 +847,11 @@ static int img_spdif_in_suspend(struct device *dev) ...@@ -803,9 +847,11 @@ static int img_spdif_in_suspend(struct device *dev)
static int img_spdif_in_resume(struct device *dev) static int img_spdif_in_resume(struct device *dev)
{ {
struct img_spdif_in *spdif = dev_get_drvdata(dev); struct img_spdif_in *spdif = dev_get_drvdata(dev);
int i; int i, ret;
clk_prepare_enable(spdif->clk_sys); ret = img_spdif_in_runtime_resume(dev);
if (ret)
return ret;
for (i = 0; i < IMG_SPDIF_IN_NUM_ACLKGEN; i++) for (i = 0; i < IMG_SPDIF_IN_NUM_ACLKGEN; i++)
img_spdif_in_aclkgen_writel(spdif, i); img_spdif_in_aclkgen_writel(spdif, i);
...@@ -813,6 +859,9 @@ static int img_spdif_in_resume(struct device *dev) ...@@ -813,6 +859,9 @@ static int img_spdif_in_resume(struct device *dev)
img_spdif_in_writel(spdif, spdif->suspend_clkgen, IMG_SPDIF_IN_CLKGEN); img_spdif_in_writel(spdif, spdif->suspend_clkgen, IMG_SPDIF_IN_CLKGEN);
img_spdif_in_writel(spdif, spdif->suspend_ctl, IMG_SPDIF_IN_CTL); img_spdif_in_writel(spdif, spdif->suspend_ctl, IMG_SPDIF_IN_CTL);
if (pm_runtime_status_suspended(dev))
img_spdif_in_runtime_suspend(dev);
return 0; return 0;
} }
#endif #endif
...@@ -824,6 +873,8 @@ static const struct of_device_id img_spdif_in_of_match[] = { ...@@ -824,6 +873,8 @@ static const struct of_device_id img_spdif_in_of_match[] = {
MODULE_DEVICE_TABLE(of, img_spdif_in_of_match); MODULE_DEVICE_TABLE(of, img_spdif_in_of_match);
static const struct dev_pm_ops img_spdif_in_pm_ops = { static const struct dev_pm_ops img_spdif_in_pm_ops = {
SET_RUNTIME_PM_OPS(img_spdif_in_runtime_suspend,
img_spdif_in_runtime_resume, NULL)
SET_SYSTEM_SLEEP_PM_OPS(img_spdif_in_suspend, img_spdif_in_resume) SET_SYSTEM_SLEEP_PM_OPS(img_spdif_in_suspend, img_spdif_in_resume)
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment