dma: img-spdif-out: Add power management
v2 cover dma: img-spdif-out: Add power management
This patch set adds power managment to the img-spdif-out driver. The first patch adds system PM suspend / resume handling and the second patch adds control of the sys clock to runtime PM.
Changes in v2:
- Changed from ASoC specific pm callbacks to device ones
Ed Blake (2):
ASoC: img-spdif-out: Add suspend / resume handling
ASoC: img-spdif-out: Add control of sys clock to runtime PM
sound/soc/img/img-spdif-out.c | 73 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 60 insertions(+), 13 deletions(-)
Signature · 1 line
2.11.0
PATCH v2 1/2 ASoC: img-spdif-out: Add suspend / resume handling
Implement suspend and resume callbacks to save and restore register state, to support platforms where the power is disabled during suspend.
In future the driver could be converted to use regmap which would simplify the suspend and resume code.
---
Changes in v2:
- Changed from ASoC specific pm callbacks to device ones
--- sound/soc/img/img-spdif-out.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
sound/soc/img/img-spdif-out.c +44 -0
@@ -47,6 +47,9 @@ struct img_spdif_out {struct snd_dmaengine_dai_dma_data dma_data;struct device *dev;struct reset_control *rst; +u32 suspend_ctl; +u32 suspend_csl; +u32 suspend_csh; };static int img_spdif_out_runtime_suspend (struct device *dev)
@@ -414,6 +417,46 @@ static int img_spdif_out_dev_remove(struct platform_device *pdev)return 0 ; } +#ifdef CONFIG_PM_SLEEP +static int img_spdif_out_suspend (struct device *dev) +{ +struct img_spdif_out *spdif =dev_get_drvdata (dev); +int ret; + +if (pm_runtime_status_suspended (dev)) { + ret =img_spdif_out_runtime_resume (dev); +if (ret) +return ret; + } + + spdif->suspend_ctl =img_spdif_out_readl (spdif,IMG_SPDIF_OUT_CTL ); + spdif->suspend_csl =img_spdif_out_readl (spdif,IMG_SPDIF_OUT_CSL ); + spdif->suspend_csh =img_spdif_out_readl (spdif,IMG_SPDIF_OUT_CSH_UV ); + +img_spdif_out_runtime_suspend (dev); + +return 0 ; +} + +static int img_spdif_out_resume (struct device *dev) +{ +struct img_spdif_out *spdif =dev_get_drvdata (dev); +int ret; + + ret =img_spdif_out_runtime_resume (dev); +if (ret) +return ret; + +img_spdif_out_writel (spdif, spdif->suspend_ctl,IMG_SPDIF_OUT_CTL ); +img_spdif_out_writel (spdif, spdif->suspend_csl,IMG_SPDIF_OUT_CSL ); +img_spdif_out_writel (spdif, spdif->suspend_csh,IMG_SPDIF_OUT_CSH_UV ); + +if (pm_runtime_status_suspended (dev)) +img_spdif_out_runtime_suspend (dev); + +return 0 ; +} +#endif static const struct of_device_id img_spdif_out_of_match[] = { { .compatible ="img,spdif-out" }, {}
@@ -423,6 +466,7 @@ MODULE_DEVICE_TABLE(of, img_spdif_out_of_match);static const struct dev_pm_ops img_spdif_out_pm_ops = { SET_RUNTIME_PM_OPS(img_spdif_out_runtime_suspend, img_spdif_out_runtime_resume, NULL) +SET_SYSTEM_SLEEP_PM_OPS (img_spdif_out_suspend, img_spdif_out_resume) };static struct platform_driver img_spdif_out_driver = {
Signature · 1 line
2.11.0
PATCH v2 2/2 ASoC: img-spdif-out: Add control of sys clock to runtime PM
In reply to Ed BlakeDisable sys clock as well as ref clock when runtime suspended.
--- sound/soc/img/img-spdif-out.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
sound/soc/img/img-spdif-out.c +17 -14
@@ -57,6 +57,7 @@ static int img_spdif_out_runtime_suspend(struct device *dev)struct img_spdif_out *spdif =dev_get_drvdata (dev);clk_disable_unprepare (spdif->clk_ref); +clk_disable_unprepare (spdif->clk_sys);return 0 ; }
@@ -66,9 +67,16 @@ static int img_spdif_out_runtime_resume(struct device *dev)struct img_spdif_out *spdif =dev_get_drvdata (dev);int ret; + ret =clk_prepare_enable (spdif->clk_sys); +if (ret) { +dev_err (dev,"clk_enable failed: %d\n" , ret); +return ret; + } + ret =clk_prepare_enable (spdif->clk_ref);if (ret) {dev_err (dev,"clk_enable failed: %d\n" , ret); +clk_disable_unprepare (spdif->clk_sys);return ret; }
@@ -358,21 +366,21 @@ static int img_spdif_out_probe(struct platform_device *pdev)return PTR_ERR (spdif->clk_ref); } - ret =clk_prepare_enable (spdif->clk_sys); -if (ret) -return ret; - -img_spdif_out_writel (spdif,IMG_SPDIF_OUT_CTL_FS_MASK , -IMG_SPDIF_OUT_CTL ); - -img_spdif_out_reset (spdif); -pm_runtime_enable (&pdev->dev);if (!pm_runtime_enabled (&pdev->dev)) { ret =img_spdif_out_runtime_resume (&pdev->dev);if (ret) goto err_pm_disable; } + ret =pm_runtime_get_sync (&pdev->dev); +if (ret <0 ) + goto err_suspend; + +img_spdif_out_writel (spdif,IMG_SPDIF_OUT_CTL_FS_MASK , +IMG_SPDIF_OUT_CTL ); + +img_spdif_out_reset (spdif); +pm_runtime_put (&pdev->dev);spin_lock_init (&spdif->lock);
@@ -399,21 +407,16 @@ static int img_spdif_out_probe(struct platform_device *pdev)img_spdif_out_runtime_suspend (&pdev->dev); err_pm_disable:pm_runtime_disable (&pdev->dev); -clk_disable_unprepare (spdif->clk_sys);return ret; }static int img_spdif_out_dev_remove (struct platform_device *pdev) { -struct img_spdif_out *spdif =platform_get_drvdata (pdev); -pm_runtime_disable (&pdev->dev);if (!pm_runtime_status_suspended (&pdev->dev))img_spdif_out_runtime_suspend (&pdev->dev); -clk_disable_unprepare (spdif->clk_sys); -return 0 ; }
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: img-spdif-out: Add suspend / resume handling" to the asoc tree
In reply to Ed BlakeThe patch
ASoC: img-spdif-out: Add suspend / resume handling
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
634a09d03753844e9fe1af8298266d0126d73549Mon Sep 17 00:00:00 2001
From: Ed Blake <[email protected]>
Date: Fri, 6 Oct 2017 15:56:06 +0100
Subject: [PATCH] ASoC: img-spdif-out: Add suspend / resume handling
Implement suspend and resume callbacks to save and restore register state, to support platforms where the power is disabled during suspend.
In future the driver could be converted to use regmap which would simplify the suspend and resume code.
--- sound/soc/img/img-spdif-out.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
sound/soc/img/img-spdif-out.c +44 -0
@@ -47,6 +47,9 @@ struct img_spdif_out {struct snd_dmaengine_dai_dma_data dma_data;struct device *dev;struct reset_control *rst; +u32 suspend_ctl; +u32 suspend_csl; +u32 suspend_csh; };static int img_spdif_out_runtime_suspend (struct device *dev)
@@ -414,6 +417,46 @@ static int img_spdif_out_dev_remove(struct platform_device *pdev)return 0 ; } +#ifdef CONFIG_PM_SLEEP +static int img_spdif_out_suspend (struct device *dev) +{ +struct img_spdif_out *spdif =dev_get_drvdata (dev); +int ret; + +if (pm_runtime_status_suspended (dev)) { + ret =img_spdif_out_runtime_resume (dev); +if (ret) +return ret; + } + + spdif->suspend_ctl =img_spdif_out_readl (spdif,IMG_SPDIF_OUT_CTL ); + spdif->suspend_csl =img_spdif_out_readl (spdif,IMG_SPDIF_OUT_CSL ); + spdif->suspend_csh =img_spdif_out_readl (spdif,IMG_SPDIF_OUT_CSH_UV ); + +img_spdif_out_runtime_suspend (dev); + +return 0 ; +} + +static int img_spdif_out_resume (struct device *dev) +{ +struct img_spdif_out *spdif =dev_get_drvdata (dev); +int ret; + + ret =img_spdif_out_runtime_resume (dev); +if (ret) +return ret; + +img_spdif_out_writel (spdif, spdif->suspend_ctl,IMG_SPDIF_OUT_CTL ); +img_spdif_out_writel (spdif, spdif->suspend_csl,IMG_SPDIF_OUT_CSL ); +img_spdif_out_writel (spdif, spdif->suspend_csh,IMG_SPDIF_OUT_CSH_UV ); + +if (pm_runtime_status_suspended (dev)) +img_spdif_out_runtime_suspend (dev); + +return 0 ; +} +#endif static const struct of_device_id img_spdif_out_of_match[] = { { .compatible ="img,spdif-out" }, {}
@@ -423,6 +466,7 @@ MODULE_DEVICE_TABLE(of, img_spdif_out_of_match);static const struct dev_pm_ops img_spdif_out_pm_ops = { SET_RUNTIME_PM_OPS(img_spdif_out_runtime_suspend, img_spdif_out_runtime_resume, NULL) +SET_SYSTEM_SLEEP_PM_OPS (img_spdif_out_suspend, img_spdif_out_resume) };static struct platform_driver img_spdif_out_driver = {
Signature · 1 line
2.14.1