ASoC: Merge up fixes

For the benefit of CI.

diff --cc sound/soc/codecs/cs35l56-i2c.c
Simple merge

diff --cc sound/soc/codecs/cs42l43.c
Simple merge

diff --cc sound/soc/codecs/wm_adsp.c
Simple merge

diff --cc sound/soc/fsl/fsl-asoc-card.c
index 5b31c12a56f9362bf518fc74a91ead11d5910d72,bab7d34cf585bfed41bee48c8e6bce74ddd36e65..0957ff7c55c2f2d108afd3f6fed5eb0a453f4d46
--- 1/sound/soc/fsl/fsl-asoc-card.c
--- 2/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@@ -248,9 -248,9 +248,9 @@@ static int fsl_asoc_card_hw_free(struc
  
        priv->streams &= ~BIT(substream->stream);
  
-       if (!priv->streams && codec_priv->pll_id && codec_priv->fll_id) {
+       if (!priv->streams && codec_priv->pll_id >= 0 && codec_priv->fll_id >= 0) {
                /* Force freq to be free_freq to avoid error message in codec */
 -              ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0),
 +              ret = snd_soc_dai_set_sysclk(snd_soc_rtd_to_codec(rtd, 0),
                                             codec_priv->mclk_id,
                                             codec_priv->free_freq,
                                             SND_SOC_CLOCK_IN);

diff --cc sound/soc/fsl/imx-audmix.c
Simple merge

diff --cc sound/soc/fsl/imx-rpmsg.c
Simple merge

diff --cc sound/soc/generic/simple-card-utils.c
Simple merge

diff --cc sound/soc/generic/simple-card.c
index a88812ab3ed17e9d9bc219b9d522baaab331e4ff,274417e39e7de0972e0132846d944094843e650c..b95b86315502a7c3e7df098c3de112570a0594ee
--- 1/sound/soc/generic/simple-card.c
--- 2/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@@ -769,8 -772,8 +771,8 @@@ static int simple_probe(struct platform
                    !cinfo->codec ||
                    !cinfo->platform ||
                    !cinfo->cpu_dai.name) {
 -                      dev_err(dev, "insufficient asoc_simple_card_info settings\n");
 +                      dev_err(dev, "insufficient simple_util_info settings\n");
-                       return -EINVAL;
+                       goto err;
                }
  
                cpus                    = dai_link->cpus;

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

diff --cc sound/soc/intel/common/soc-acpi-intel-adl-match.c
Simple merge

diff --cc sound/soc/intel/common/soc-acpi-intel-mtl-match.c
Simple merge

diff --cc sound/soc/soc-generic-dmaengine-pcm.c
Simple merge

diff --cc sound/soc/sof/intel/mtl.c
Simple merge

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

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