From: Sugar Zhang <sugar.zhang@rock-chips.com> To: dianders@chromium.org, broonie@kernel.org Cc: linux-rockchip@lists.infradead.org, Sugar Zhang <sugar.zhang@rock-chips.com>, Liam Girdwood <lgirdwood@gmail.com>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Heiko Stuebner <heiko@sntech.de>, alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle Date: Tue, 6 Sep 2016 09:19:53 +0800 [thread overview] Message-ID: <1473124793-74625-1-git-send-email-sugar.zhang@rock-chips.com> (raw) 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
WARNING: multiple messages have this Message-ID (diff)
From: sugar.zhang@rock-chips.com (Sugar Zhang) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle Date: Tue, 6 Sep 2016 09:19:53 +0800 [thread overview] Message-ID: <1473124793-74625-1-git-send-email-sugar.zhang@rock-chips.com> (raw) 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
next reply other threads:[~2016-09-06 1:26 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-09-06 1:19 Sugar Zhang [this message] 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 2016-09-06 10:29 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1473124793-74625-1-git-send-email-sugar.zhang@rock-chips.com \ --to=sugar.zhang@rock-chips.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=dianders@chromium.org \ --cc=heiko@sntech.de \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.