diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2020-10-27 09:41:31 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2020-11-19 08:34:22 +0000 |
| commit | 1cd7b935d298c6497581f86c3f74d2d2be54f294 (patch) | |
| tree | 20e4e5b114a7e00ba45f53b70f3c19cbd55739b0 /drivers/mfd/madera-core.c | |
| parent | 21ca0f5b5c04f10c12aa977b04e6bbdbed2196ca (diff) | |
mfd: madera: Add reset as part of resume
The DCVDD supply does not always power down when the CODEC enters
suspend, for example shared regulators or always-on regulators. In
these cases if a register is written back to the default value whilst
the CODEC is in suspend that register will retain the previous value.
As DCVDD never powered down, the register retains its old value and
as the cache sync only synchronises registers that differ from the
default the new value is never written out.
Ensure the registers are in the expected state after suspend by always
resetting the CODEC on resume. This also has the benefit of being
recommended by the datasheet for DCVDD supplies that take longer than
2mS to rise.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/madera-core.c')
| -rw-r--r-- | drivers/mfd/madera-core.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c index 4ed6ad8ce002..a9c6f0833f32 100644 --- a/drivers/mfd/madera-core.c +++ b/drivers/mfd/madera-core.c @@ -291,6 +291,8 @@ static int __maybe_unused madera_runtime_resume(struct device *dev) dev_dbg(dev, "Leaving sleep mode\n"); + madera_enable_hard_reset(madera); + ret = regulator_enable(madera->dcvdd); if (ret) { dev_err(dev, "Failed to enable DCVDD: %d\n", ret); @@ -300,7 +302,19 @@ static int __maybe_unused madera_runtime_resume(struct device *dev) regcache_cache_only(madera->regmap, false); regcache_cache_only(madera->regmap_32bit, false); - usleep_range(MADERA_RESET_MIN_US, MADERA_RESET_MAX_US); + madera_disable_hard_reset(madera); + + if (!madera->pdata.reset) { + ret = madera_wait_for_boot(madera); + if (ret) + goto err; + + ret = madera_soft_reset(madera); + if (ret) { + dev_err(dev, "Failed to reset: %d\n", ret); + goto err; + } + } ret = madera_wait_for_boot(madera); if (ret) |