3.19.8-ckt23 -stable review patch. If anyone has any objections, please let me know.
---8<------------------------------------------------------------ From: Mark Brown <broo...@kernel.org> commit d3030d11961a8c103cf07aed59905276ddfc06c2 upstream. The ak4642 driver is using a regmap cache sync to restore the configuration of the chip on resume but (as Peter observed) does not actually define a register cache which means that the resume is never going to work and we trigger asserts in regmap. Fix this by enabling caching. Reported-by: Geert Uytterhoeven <ge...@linux-m68k.org> Reported-by: Peter Ujfalusi <peter.ujfal...@ti.com> Tested-by: Geert Uytterhoeven <geert+rene...@glider.be> Signed-off-by: Mark Brown <broo...@kernel.org> [ kamal: backport to 4.2-stable: no separate ak4643_regmap ] Signed-off-by: Kamal Mostafa <ka...@canonical.com> --- sound/soc/codecs/ak4642.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index dde8b49..dd2a554 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -508,6 +508,7 @@ static const struct regmap_config ak4642_regmap = { .max_register = ARRAY_SIZE(ak4642_reg) + 1, .reg_defaults = ak4642_reg, .num_reg_defaults = ARRAY_SIZE(ak4642_reg), + .cache_type = REGCACHE_RBTREE, }; static const struct regmap_config ak4648_regmap = { @@ -516,6 +517,7 @@ static const struct regmap_config ak4648_regmap = { .max_register = ARRAY_SIZE(ak4648_reg) + 1, .reg_defaults = ak4648_reg, .num_reg_defaults = ARRAY_SIZE(ak4648_reg), + .cache_type = REGCACHE_RBTREE, }; static const struct ak4642_drvdata ak4642_drvdata = { -- 2.7.4