Merge tag 'asoc-v5.18' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

ASoC: Updates for v5.18

Quite a quiet release for ASoC, lots of work on drivers and platforms
but nothing too groundbreaking but not much on the core itself:

 - Start of moving SoF to support multiple IPC mechanisms.
 - Use of NHLT ACPI table to reduce the amount of quirking required for
   Intel systems.
 - Some building blocks for use in forthcoming Intel AVS driver for
   legacy Intel DSP firmwares.
 - Support for AMD PDM, Atmel PDMC, Awinic AW8738, i.MX cards with
   TLV320AIC31xx, Intel machines with CS35L41 and ESSX8336, Mediatek
   MT8181 wideband bluetooth, nVidia Tegra234, Qualcomm SC7280, Renesas
   RZ/V2L, Texas Instruments TAS585M

diff --cc MAINTAINERS
Simple merge

diff --cc include/sound/hdaudio_ext.h
Simple merge

diff --cc sound/soc/amd/acp/acp-mach-common.c
Simple merge

diff --cc sound/soc/amd/acp/acp-sof-mach.c
index 4cc431e54fe1a076f86347a972856fc77fb9c679,c1d9650fc222540da8e1ab1d2a3f1a932f4fe30d..3346677949e3ecc44fad5a5b923d99cb247783e1
--- 1/sound/soc/amd/acp/acp-sof-mach.c
--- 2/sound/soc/amd/acp/acp-sof-mach.c
+++ b/sound/soc/amd/acp/acp-sof-mach.c
@@@ -37,9 -37,18 +37,18 @@@ static struct acp_card_drvdata sof_rt56
        .hs_codec_id = RT5682,
        .amp_codec_id = MAX98360A,
        .dmic_codec_id = DMIC,
 -      .gpio_spkr_en = EN_SPKR_GPIO_NK,
 +      .gpio_spkr_en = EN_SPKR_GPIO_NONE,
  };
  
+ static struct acp_card_drvdata sof_rt5682s_rt1019_data = {
+       .hs_cpu_id = I2S_SP,
+       .amp_cpu_id = I2S_SP,
+       .dmic_cpu_id = DMIC,
+       .hs_codec_id = RT5682S,
+       .amp_codec_id = RT1019,
+       .dmic_codec_id = DMIC,
+ };
+ 
  static struct acp_card_drvdata sof_rt5682s_max_data = {
        .hs_cpu_id = I2S_SP,
        .amp_cpu_id = I2S_SP,

diff --cc sound/soc/amd/vangogh/acp5x-mach.c
Simple merge

diff --cc sound/soc/amd/vangogh/acp5x.h
Simple merge

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

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

diff --cc sound/soc/codecs/lpass-rx-macro.c
Simple merge

diff --cc sound/soc/codecs/lpass-va-macro.c
Simple merge

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

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

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

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

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

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

diff --cc sound/soc/qcom/lpass-platform.c
Simple merge

diff --cc sound/soc/sof/intel/hda-loader.c
index 9bbfdab8009dea836af869c7ddbd7d4315919209,3c0d7cbdf1748b7d38b45478cc6192241c5c582a..2ac5d9d0719bc8e0ef7c1e81b1e246727006e023
--- 1/sound/soc/sof/intel/hda-loader.c
--- 2/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@@ -55,26 -73,25 +73,26 @@@ static struct hdac_ext_stream *cl_strea
        hstream->bufsize = size;
  
        if (direction == SNDRV_PCM_STREAM_CAPTURE) {
-               ret = hda_dsp_iccmax_stream_hw_params(sdev, dsp_stream, dmab, NULL);
+               ret = hda_dsp_iccmax_stream_hw_params(sdev, hext_stream, dmab, NULL);
                if (ret < 0) {
                        dev_err(sdev->dev, "error: iccmax stream prepare failed: %d\n", ret);
 -                      goto error;
 +                      goto out_free;
                }
        } else {
-               ret = hda_dsp_stream_hw_params(sdev, dsp_stream, dmab, NULL);
+               ret = hda_dsp_stream_hw_params(sdev, hext_stream, dmab, NULL);
                if (ret < 0) {
                        dev_err(sdev->dev, "error: hdac prepare failed: %d\n", ret);
 -                      goto error;
 +                      goto out_free;
                }
-               hda_dsp_stream_spib_config(sdev, dsp_stream, HDA_DSP_SPIB_ENABLE, size);
+               hda_dsp_stream_spib_config(sdev, hext_stream, HDA_DSP_SPIB_ENABLE, size);
        }
  
-       return dsp_stream;
+       return hext_stream;
  
 -error:
 -      hda_dsp_stream_put(sdev, direction, hstream->stream_tag);
 +out_free:
        snd_dma_free_pages(dmab);
 +out_put:
 +      hda_dsp_stream_put(sdev, direction, hstream->stream_tag);
        return ERR_PTR(ret);
  }
  

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