ASoC: Merge up fixes

Some new SOF changes depend on the fixes there.

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc sound/soc/codecs/cs35l56.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/intel/avs/icl.c
index e0880acf8050b23fc847c5d08e25b5e4274a4e0b,d2554c8577326b533764862829e84b8e001f7016..3a96c4304ca65751a77819731b2bed05518e3c0f
--- 1/sound/soc/intel/avs/icl.c
--- 2/sound/soc/intel/avs/icl.c
+++ b/sound/soc/intel/avs/icl.c
@@@ -66,11 -64,10 +66,11 @@@ static_assert(sizeof(struct avs_icl_mem
  struct avs_icl_memwnd2 {
        union {
                struct avs_icl_memwnd2_desc slot_desc[AVS_ICL_MEMWND2_SLOTS_COUNT];
-               u8 rsvd[PAGE_SIZE];
+               u8 rsvd[SZ_4K];
        };
 -      u8 slot_array[AVS_ICL_MEMWND2_SLOTS_COUNT][PAGE_SIZE];
 +      u8 slot_array[AVS_ICL_MEMWND2_SLOTS_COUNT][SZ_4K];
  } __packed;
 +static_assert(sizeof(struct avs_icl_memwnd2) == 65536);
  
  #define AVS_ICL_SLOT_UNUSED \
        ((union avs_icl_memwnd2_slot_type) { 0x00000000U })

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

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

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

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