ASoC: Merge up fixes

They have build/application dependencies for some new changes coming in.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/firmware/cirrus/test/cs_dsp_mock_mem_maps.c
Simple merge

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/hdmi-codec.c
Simple merge

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

diff --cc sound/soc/intel/avs/pcm.c
index af4e6fbadb012cdff12986afdf2718356ec58c7e,d83ef504643bbbe04040209645e7794c5db7b874..405cfc1ab0cba63f25c8402f03fad9874cf8a3db
--- 1/sound/soc/intel/avs/pcm.c
--- 2/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@@ -32,8 -31,11 +32,12 @@@ struct avs_dma_data 
                struct hdac_ext_stream *host_stream;
        };
  
+       struct snd_pcm_hw_constraint_list rate_list;
+       struct snd_pcm_hw_constraint_list channels_list;
+       struct snd_pcm_hw_constraint_list sample_bits_list;
+ 
        struct work_struct period_elapsed_work;
 +      struct hdac_ext_link *link;
        struct snd_pcm_substream *substream;
  };
  

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