* [PATCH v2] ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle
@ 2016-09-06 1:19 Sugar Zhang
2016-09-06 10:29 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Sugar Zhang @ 2016-09-06 1:19 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, i2s 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_i2s.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 652e8c5..98b6822 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -57,6 +57,7 @@ static int i2s_runtime_suspend(struct device *dev)
{
struct rk_i2s_dev *i2s = dev_get_drvdata(dev);
+ regcache_cache_only(i2s->regmap, true);
clk_disable_unprepare(i2s->mclk);
return 0;
@@ -65,7 +66,7 @@ static int i2s_runtime_suspend(struct device *dev)
static int i2s_runtime_resume(struct device *dev)
{
struct rk_i2s_dev *i2s = dev_get_drvdata(dev);
- int ret;
+ int ret = 0;
ret = clk_prepare_enable(i2s->mclk);
if (ret) {
@@ -73,7 +74,14 @@ static int i2s_runtime_resume(struct device *dev)
return ret;
}
- return 0;
+ regcache_cache_only(i2s->regmap, false);
+ regcache_mark_dirty(i2s->regmap);
+
+ ret = regcache_sync(i2s->regmap);
+ if (ret)
+ clk_disable_unprepare(i2s->mclk);
+
+ return ret;
}
static inline struct rk_i2s_dev *to_info(struct snd_soc_dai *dai)
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle
2016-09-06 1:19 [PATCH v2] ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle Sugar Zhang
@ 2016-09-06 10:29 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2016-09-06 10:29 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: 278 bytes --]
On Tue, Sep 06, 2016 at 09:19:53AM +0800, Sugar Zhang wrote:
> struct rk_i2s_dev *i2s = dev_get_drvdata(dev);
> - int ret;
> + int ret = 0;
>
Why are you initializing this? All this will do is stop the compiler
warning you about use without initializaiton bugs.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-06 10:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-06 1:19 [PATCH v2] ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle Sugar Zhang
2016-09-06 10:29 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).