From: Sugar Zhang Date: Wed, 7 Sep 2016 06:27:33 +0000 (+0800) Subject: UPSTREAM: ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle X-Git-Tag: firefly_0821_release~1031 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ed1e3669a3fa9b47ae24bbb44110eaeb28c90580;p=firefly-linux-kernel-4.4.55.git UPSTREAM: 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. Change-Id: Ie37aba46f6ee21be2af404da24ba667e3ca86d6c Signed-off-by: Sugar Zhang Signed-off-by: Mark Brown Signed-off-by: Douglas Anderson (cherry picked from git.kernel.org broonie/sound.git topic/rockchip commit f0447f6cbb202e1be8244d15aee390a96d65e490) --- diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 2408872b037f..d2d66f0b9e1f 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; @@ -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)