Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25b4ab43 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: max98090: Fix reset at resume time 



Reset needs to wait 20ms before other codec IO is performed. This wait
was not being performed. Fix this by making sure the reset register is not
restored with the cache, but use the manual reset method in resume with
the wait.

Signed-off-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
parent 729af1ce

sound/soc/codecs/max98090.c

+3 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ static struct reg_default max98090_reg[] = { 
static bool max98090_volatile_register(struct device *dev, unsigned int reg)

{

	switch (reg) {

	case M98090_REG_SOFTWARE_RESET:

	case M98090_REG_DEVICE_STATUS:

	case M98090_REG_JACK_STATUS:

	case M98090_REG_REVISION_ID:
@@ -2374,6 +2375,8 @@ static int max98090_runtime_resume(struct device *dev) 


	regcache_cache_only(max98090->regmap, false);



	max98090_reset(max98090);



	regcache_sync(max98090->regmap);



	return 0;