Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1477010 > unrolled thread

[PATCH v2] ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle

Back to article view | Back to linux.kernel

Contents

  [PATCH v2] ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle Sugar Zhang <sugar.zhang@rock-chips.com> - 2016-09-06 03:30 +0200
    Re: [PATCH v2] ASoC: rockchip: i2s: restore register during  runtime_suspend/resume cycle Mark Brown <broonie@kernel.org> - 2016-09-06 12:40 +0200

#1477010 — [PATCH v2] ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle

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

[toc] | [next] | [standalone]

#1477269 — Re: [PATCH v2] ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle

[Multipart message — attachments visible in raw view] — view raw

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.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web