diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-09-30 19:40:40 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-09-30 19:40:40 +0300 |
| commit | eeea8b40cd2866ca24f25e5ef09225edb076ae45 (patch) | |
| tree | ece5b5287ee2ce53a841b66d0f526947f74d036f /sound/soc/rockchip/rockchip_spdif.c | |
| parent | 3383c5c395386ac8e258b1a324c72ce850b84a9e (diff) | |
| parent | 513e43efafe329dad7b5794583b67ac898dcbdca (diff) | |
| download | linux-eeea8b40cd2866ca24f25e5ef09225edb076ae45.tar.xz | |
Merge tag 'asoc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v4.9
Apart from the cleanups done by Morimoto-san this has very much been a
driver focused release with very little generic change:
- A big factoring out of the simple-card code to allow it to be shared
more with the rcar generic card from Kuninori Morimoto.
- Removal of some operations duplicated on the CODEC level, again by
Kuninori Morimoto.
- Lots more machine support for x86 systems.
- New drivers for Nuvoton NAU88C10, Realtek RT5660 and RT5663.
Diffstat (limited to 'sound/soc/rockchip/rockchip_spdif.c')
| -rw-r--r-- | sound/soc/rockchip/rockchip_spdif.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index 4ca265737eda..fa8101d1e16f 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); @@ -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, |