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

ASoC: Updates for v5.17

Not much going on framework release this time, but a big update for
drivers especially the Intel and SOF ones.

 - Refinements and cleanups around the delay() APIs.
 - Wider use of dev_err_probe().
 - Continuing cleanups and improvements to the SOF code.
 - Support for pin switches in simple-card derived cards.
 - Support for AMD Renoir ACP, Asahi Kasei Microdevices AKM4375, Intel
   systems using NAU8825 and MAX98390, Mediatek MT8915, nVidia Tegra20
   S/PDIF, Qualcomm systems using ALC5682I-VS and Texas Instruments
   TLV320ADC3xxx.

diff --cc MAINTAINERS
Simple merge

diff --cc include/uapi/sound/asound.h
Simple merge

diff --cc sound/soc/intel/skylake/skl-pcm.c
index 4c5d209,8378c18..55f310e
--- 1/sound/soc/intel/skylake/skl-pcm.c
--- 2/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@@ -564,14 -562,10 +564,11 @@@ static int skl_link_hw_params(struct sn
  
        stream_tag = hdac_stream(link_dev)->stream_tag;
  
-       /* set the stream tag in the codec dai dma params  */
-       if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-               snd_soc_dai_set_tdm_slot(codec_dai, stream_tag, 0, 0, 0);
-       else
-               snd_soc_dai_set_tdm_slot(codec_dai, 0, stream_tag, 0, 0);
+       /* set the hdac_stream in the codec dai */
+       snd_soc_dai_set_stream(codec_dai, hdac_stream(link_dev), substream->stream);
  
        p_params.s_fmt = snd_pcm_format_width(params_format(params));
 +      p_params.s_cont = snd_pcm_format_physical_width(params_format(params));
        p_params.ch = params_channels(params);
        p_params.s_freq = params_rate(params);
        p_params.stream = substream->stream;