summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-10-31 13:04:27 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-31 13:04:27 -0700
commitf00ef440942542c6cc7ea13ac8eaa3aaa643d23a (patch)
treed8c5a25b6a7cd388d054d1b6e0742a8af82acf36
parentef7b2af68daa4eb0ad340f8459707f2c4c40984c (diff)
parent0eb6738264529f1f5b0ebda7e5f1d3a2bee1ea31 (diff)
Merge "ASoC: wcd934x: Restore CPR defaults after SSR"
-rw-r--r--sound/soc/codecs/wcd934x/wcd934x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wcd934x/wcd934x.c b/sound/soc/codecs/wcd934x/wcd934x.c
index d19b13c1f83a..5d6119c6d86a 100644
--- a/sound/soc/codecs/wcd934x/wcd934x.c
+++ b/sound/soc/codecs/wcd934x/wcd934x.c
@@ -8677,6 +8677,8 @@ static int tavil_post_reset_cb(struct wcd9xxx *wcd9xxx)
regcache_sync(codec->component.regmap);
__tavil_cdc_mclk_enable(tavil, false);
+ tavil_update_cpr_defaults(tavil);
+
pdata = dev_get_platdata(codec->dev->parent);
ret = tavil_handle_pdata(tavil, pdata);
if (IS_ERR_VALUE(ret))