* [PATCH v2] ASoC: rockchip: spdif: restore register during runtime_suspend/resume cycle
@ 2016-09-06 1:23 ` Sugar Zhang
0 siblings, 0 replies; 4+ messages in thread
From: Sugar Zhang @ 2016-09-06 1:23 UTC (permalink / raw)
To: dianders, broonie
Cc: linux-rockchip, Sugar Zhang, Liam Girdwood, Jaroslav Kysela,
Takashi Iwai, Heiko Stuebner, alsa-devel, linux-arm-kernel,
linux-kernel
when step into runtime_suspend, spdif pd will be disabled and loss state.
so need to restore register when runtime_resume.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---
Changes in v2:
- remove system suspend/resume and restore register
in runtime_suspend/resume per Doug Anderson's suggestion
sound/soc/rockchip/rockchip_spdif.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c
index 4ca2657..0eb8d49 100644
--- a/sound/soc/rockchip/rockchip_spdif.c
+++ b/sound/soc/rockchip/rockchip_spdif.c
@@ -65,6 +65,7 @@ static int __maybe_unused rk_spdif_runtime_suspend(struct device *dev)
{
struct rk_spdif_dev *spdif = dev_get_drvdata(dev);
+ regcache_cache_only(spdif->regmap, true);
clk_disable_unprepare(spdif->mclk);
clk_disable_unprepare(spdif->hclk);
@@ -74,7 +75,7 @@ static int __maybe_unused rk_spdif_runtime_suspend(struct device *dev)
static int __maybe_unused rk_spdif_runtime_resume(struct device *dev)
{
struct rk_spdif_dev *spdif = dev_get_drvdata(dev);
- int ret;
+ int ret = 0;
ret = clk_prepare_enable(spdif->mclk);
if (ret) {
@@ -88,7 +89,16 @@ static int __maybe_unused rk_spdif_runtime_resume(struct device *dev)
return ret;
}
- return 0;
+ regcache_cache_only(spdif->regmap, false);
+ regcache_mark_dirty(spdif->regmap);
+
+ ret = regcache_sync(spdif->regmap);
+ if (ret) {
+ clk_disable_unprepare(spdif->mclk);
+ clk_disable_unprepare(spdif->hclk);
+ }
+
+ return ret;
}
static int rk_spdif_hw_params(struct snd_pcm_substream *substream,
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2] ASoC: rockchip: spdif: restore register during runtime_suspend/resume cycle
@ 2016-09-06 1:23 ` Sugar Zhang
0 siblings, 0 replies; 4+ messages in thread
From: Sugar Zhang @ 2016-09-06 1:23 UTC (permalink / raw)
To: linux-arm-kernel
when step into runtime_suspend, spdif pd will be disabled and loss state.
so need to restore register when runtime_resume.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---
Changes in v2:
- remove system suspend/resume and restore register
in runtime_suspend/resume per Doug Anderson's suggestion
sound/soc/rockchip/rockchip_spdif.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c
index 4ca2657..0eb8d49 100644
--- a/sound/soc/rockchip/rockchip_spdif.c
+++ b/sound/soc/rockchip/rockchip_spdif.c
@@ -65,6 +65,7 @@ static int __maybe_unused rk_spdif_runtime_suspend(struct device *dev)
{
struct rk_spdif_dev *spdif = dev_get_drvdata(dev);
+ regcache_cache_only(spdif->regmap, true);
clk_disable_unprepare(spdif->mclk);
clk_disable_unprepare(spdif->hclk);
@@ -74,7 +75,7 @@ static int __maybe_unused rk_spdif_runtime_suspend(struct device *dev)
static int __maybe_unused rk_spdif_runtime_resume(struct device *dev)
{
struct rk_spdif_dev *spdif = dev_get_drvdata(dev);
- int ret;
+ int ret = 0;
ret = clk_prepare_enable(spdif->mclk);
if (ret) {
@@ -88,7 +89,16 @@ static int __maybe_unused rk_spdif_runtime_resume(struct device *dev)
return ret;
}
- return 0;
+ regcache_cache_only(spdif->regmap, false);
+ regcache_mark_dirty(spdif->regmap);
+
+ ret = regcache_sync(spdif->regmap);
+ if (ret) {
+ clk_disable_unprepare(spdif->mclk);
+ clk_disable_unprepare(spdif->hclk);
+ }
+
+ return ret;
}
static int rk_spdif_hw_params(struct snd_pcm_substream *substream,
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ASoC: rockchip: spdif: restore register during runtime_suspend/resume cycle
2016-09-06 1:23 ` Sugar Zhang
@ 2016-09-06 10:30 ` Mark Brown
-1 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2016-09-06 10:30 UTC (permalink / raw)
To: Sugar Zhang
Cc: dianders, linux-rockchip, Liam Girdwood, Jaroslav Kysela,
Takashi Iwai, Heiko Stuebner, alsa-devel, linux-arm-kernel,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
On Tue, Sep 06, 2016 at 09:23:55AM +0800, Sugar Zhang wrote:
> struct rk_spdif_dev *spdif = dev_get_drvdata(dev);
> - int ret;
> + int ret = 0;
Same here.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] ASoC: rockchip: spdif: restore register during runtime_suspend/resume cycle
@ 2016-09-06 10:30 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2016-09-06 10:30 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 06, 2016 at 09:23:55AM +0800, Sugar Zhang wrote:
> struct rk_spdif_dev *spdif = dev_get_drvdata(dev);
> - int ret;
> + int ret = 0;
Same here.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 455 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160906/45d9141a/attachment.sig>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-06 10:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-06 1:23 [PATCH v2] ASoC: rockchip: spdif: restore register during runtime_suspend/resume cycle Sugar Zhang
2016-09-06 1:23 ` Sugar Zhang
2016-09-06 10:30 ` Mark Brown
2016-09-06 10:30 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.