Commit 07687cd0 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown

ASoC: cs35l56: Don't add the same register patch multiple times

Move the call to cs35l56_set_patch() earlier in cs35l56_init() so
that it only adds the register patch on first-time initialization.

The call was after the post_soft_reset label, so every time this
function was run to re-initialize the hardware after a reset it would
call regmap_register_patch() and add the same reg_sequence again.
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Fixes: 898673b9 ("ASoC: cs35l56: Move shared data into a common data structure")
Link: https://msgid.link/r/20240129162737.497-6-rf@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent cd38ccbe
...@@ -1159,6 +1159,10 @@ int cs35l56_init(struct cs35l56_private *cs35l56) ...@@ -1159,6 +1159,10 @@ int cs35l56_init(struct cs35l56_private *cs35l56)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = cs35l56_set_patch(&cs35l56->base);
if (ret)
return ret;
/* Populate the DSP information with the revision and security state */ /* Populate the DSP information with the revision and security state */
cs35l56->dsp.part = devm_kasprintf(cs35l56->base.dev, GFP_KERNEL, "cs35l56%s-%02x", cs35l56->dsp.part = devm_kasprintf(cs35l56->base.dev, GFP_KERNEL, "cs35l56%s-%02x",
cs35l56->base.secured ? "s" : "", cs35l56->base.rev); cs35l56->base.secured ? "s" : "", cs35l56->base.rev);
...@@ -1197,10 +1201,6 @@ int cs35l56_init(struct cs35l56_private *cs35l56) ...@@ -1197,10 +1201,6 @@ int cs35l56_init(struct cs35l56_private *cs35l56)
if (ret) if (ret)
return ret; return ret;
ret = cs35l56_set_patch(&cs35l56->base);
if (ret)
return ret;
/* Registers could be dirty after soft reset or SoundWire enumeration */ /* Registers could be dirty after soft reset or SoundWire enumeration */
regcache_sync(cs35l56->base.regmap); regcache_sync(cs35l56->base.regmap);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment