aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-18 13:30:39 -0400
committerMark Brown <broonie@kernel.org>2016-05-18 14:13:28 -0400
commitd3030d11961a8c103cf07aed59905276ddfc06c2 (patch)
treea3d3bc8b39393741a43b00b8ffae77c1ba79695a
parent29cf67b99527296e9c9b9f6995c1d271d21f79c0 (diff)
ASoC: ak4642: Enable cache usage to fix crashes on resume
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 <geert@linux-m68k.org> Reported-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org
-rw-r--r--sound/soc/codecs/ak4642.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 1ee8506c06c7..4d8b9e49e8d6 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -560,6 +560,7 @@ static const struct regmap_config ak4642_regmap = {
560 .max_register = FIL1_3, 560 .max_register = FIL1_3,
561 .reg_defaults = ak4642_reg, 561 .reg_defaults = ak4642_reg,
562 .num_reg_defaults = NUM_AK4642_REG_DEFAULTS, 562 .num_reg_defaults = NUM_AK4642_REG_DEFAULTS,
563 .cache_type = REGCACHE_RBTREE,
563}; 564};
564 565
565static const struct regmap_config ak4643_regmap = { 566static const struct regmap_config ak4643_regmap = {
@@ -568,6 +569,7 @@ static const struct regmap_config ak4643_regmap = {
568 .max_register = SPK_MS, 569 .max_register = SPK_MS,
569 .reg_defaults = ak4643_reg, 570 .reg_defaults = ak4643_reg,
570 .num_reg_defaults = ARRAY_SIZE(ak4643_reg), 571 .num_reg_defaults = ARRAY_SIZE(ak4643_reg),
572 .cache_type = REGCACHE_RBTREE,
571}; 573};
572 574
573static const struct regmap_config ak4648_regmap = { 575static const struct regmap_config ak4648_regmap = {
@@ -576,6 +578,7 @@ static const struct regmap_config ak4648_regmap = {
576 .max_register = EQ_FBEQE, 578 .max_register = EQ_FBEQE,
577 .reg_defaults = ak4648_reg, 579 .reg_defaults = ak4648_reg,
578 .num_reg_defaults = ARRAY_SIZE(ak4648_reg), 580 .num_reg_defaults = ARRAY_SIZE(ak4648_reg),
581 .cache_type = REGCACHE_RBTREE,
579}; 582};
580 583
581static const struct ak4642_drvdata ak4642_drvdata = { 584static const struct ak4642_drvdata ak4642_drvdata = {