From: Mark Brown <broonie@kernel.org>
Date: Wed, 3 Apr 2024 15:07:41 +0000 (+0100)
Subject: ASoC: Merge up fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=327719aa629fa6382ecd38996191c4bc9ef0174b;p=linux.git

ASoC: Merge up fixes

Some of these, particularly the wm_adsp one in the immediate case, are
needed as a basis for new work.
---

327719aa629fa6382ecd38996191c4bc9ef0174b
diff --cc sound/soc/codecs/es8326.c
index e8526844337d0,17bd6b5160772..93385f181d2cf
--- a/sound/soc/codecs/es8326.c
+++ b/sound/soc/codecs/es8326.c
@@@ -1062,8 -1072,12 +1064,11 @@@ static int es8326_suspend(struct snd_so
  	cancel_delayed_work_sync(&es8326->jack_detect_work);
  	es8326_disable_micbias(component);
  	es8326->calibrated = false;
+ 	regmap_write(es8326->regmap, ES8326_CLK_MUX, 0x2d);
+ 	regmap_write(es8326->regmap, ES8326_DAC2HPMIX, 0x00);
+ 	regmap_write(es8326->regmap, ES8326_ANA_PDN, 0x3b);
  	regmap_write(es8326->regmap, ES8326_CLK_CTL, ES8326_CLK_OFF);
  	regcache_cache_only(es8326->regmap, true);
 -	regcache_mark_dirty(es8326->regmap);
  
  	/* reset register value to default */
  	regmap_write(es8326->regmap, ES8326_CSM_I2C_STA, 0x01);