diff options
| author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2014-05-16 16:55:20 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-16 19:56:23 +0100 |
| commit | 25b4ab430f8e166c9b63f4db28e7e812d5a59396 (patch) | |
| tree | 54e18d4f01b0b25ef48e3ff048d32ac3c8f9c3ce /sound/soc/codecs/max98090.c | |
| parent | 729af1ce6c8796808079b5ef44b302108374264a (diff) | |
| download | linux-25b4ab430f8e166c9b63f4db28e7e812d5a59396.tar.gz linux-25b4ab430f8e166c9b63f4db28e7e812d5a59396.tar.bz2 linux-25b4ab430f8e166c9b63f4db28e7e812d5a59396.zip | |
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: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'sound/soc/codecs/max98090.c')
| -rw-r--r-- | sound/soc/codecs/max98090.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 7980784d1e33..be86094817eb 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -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; |