ASoC: Merge up fixes

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

diff --cc sound/soc/codecs/es8326.c
index e8526844337d0f74a13cbbfa3d7e9a69fd104354,17bd6b5160772e01d8597767868a9d2472cae276..93385f181d2cf0112a6526f81df726950ca140fc
--- 1/sound/soc/codecs/es8326.c
--- 2/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);

diff --cc sound/soc/codecs/rt1316-sdw.c
Simple merge

diff --cc sound/soc/codecs/rt1318-sdw.c
Simple merge

diff --cc sound/soc/codecs/rt5682-sdw.c
Simple merge

diff --cc sound/soc/codecs/rt711-sdca-sdw.c
Simple merge

diff --cc sound/soc/codecs/rt711-sdw.c
Simple merge

diff --cc sound/soc/codecs/rt712-sdca-dmic.c
Simple merge

diff --cc sound/soc/codecs/rt712-sdca-sdw.c
Simple merge

diff --cc sound/soc/codecs/rt715-sdca-sdw.c
Simple merge

diff --cc sound/soc/codecs/rt715-sdca.c
Simple merge

diff --cc sound/soc/codecs/rt715-sdw.c
Simple merge

diff --cc sound/soc/codecs/rt722-sdca-sdw.c
Simple merge

diff --cc sound/soc/intel/avs/boards/es8336.c
Simple merge

diff --cc sound/soc/intel/avs/boards/i2s_test.c
Simple merge

diff --cc sound/soc/intel/avs/boards/nau8825.c
Simple merge

diff --cc sound/soc/intel/avs/boards/rt274.c
Simple merge

diff --cc sound/soc/intel/avs/boards/rt286.c
Simple merge

diff --cc sound/soc/intel/avs/boards/rt298.c
Simple merge

diff --cc sound/soc/intel/avs/boards/rt5663.c
Simple merge

diff --cc sound/soc/intel/avs/boards/rt5682.c
Simple merge

diff --cc sound/soc/intel/avs/boards/ssm4567.c
Simple merge

diff --cc sound/soc/sof/intel/hda-dai-ops.c
Simple merge

diff --cc sound/soc/sof/intel/hda.h
Simple merge

diff --cc sound/soc/sof/ipc4-priv.h
Simple merge

diff --cc sound/soc/sof/ipc4-topology.c
Simple merge

diff --cc sound/soc/sof/pcm.c
Simple merge

diff --cc sound/soc/sof/sof-audio.h
Simple merge