diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2016-01-27 14:26:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-27 13:33:50 +0000 |
| commit | 712a8038cc24dba668afe82f0413714ca87184e0 (patch) | |
| tree | 27c95b16404b743cf13ffb9d18d53e6f6714fa2c /sound/soc | |
| parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) | |
| download | blackbird-op-linux-712a8038cc24dba668afe82f0413714ca87184e0.tar.gz blackbird-op-linux-712a8038cc24dba668afe82f0413714ca87184e0.zip | |
ASoC: ssm4567: Reset device before regcache_sync()
When the ssm4567 is powered up the driver calles regcache_sync() to restore
the register map content. regcache_sync() assumes that the device is in its
power-on reset state. Make sure that this is the case by explicitly
resetting the ssm4567 register map before calling regcache_sync() otherwise
we might end up with a incorrect register map which leads to undefined
behaviour.
One such undefined behaviour was observed when returning from system
suspend while a playback stream is active, in that case the ssm4567 was
kept muted after resume.
Fixes: 1ee44ce03011 ("ASoC: ssm4567: Add driver for Analog Devices SSM4567 amplifier")
Reported-by: Harsha Priya <harshapriya.n@intel.com>
Tested-by: Fang, Yang A <yang.a.fang@intel.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/ssm4567.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c index e619d5651b09..080c78e88e10 100644 --- a/sound/soc/codecs/ssm4567.c +++ b/sound/soc/codecs/ssm4567.c @@ -352,6 +352,11 @@ static int ssm4567_set_power(struct ssm4567 *ssm4567, bool enable) regcache_cache_only(ssm4567->regmap, !enable); if (enable) { + ret = regmap_write(ssm4567->regmap, SSM4567_REG_SOFT_RESET, + 0x00); + if (ret) + return ret; + ret = regmap_update_bits(ssm4567->regmap, SSM4567_REG_POWER_CTRL, SSM4567_POWER_SPWDN, 0x00); |
