Merge remote-tracking branch 'asoc/for-5.10' into asoc-next

diff --cc drivers/base/regmap/regmap.c
Simple merge

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

diff --cc sound/soc/fsl/fsl_sai.c
Simple merge

diff --cc sound/soc/fsl/fsl_sai.h
index 677ecfc1ec68f9735dd6d43f8601d0ada4519edc,ba7425a9e217ad9cc67a7dff5ed10ee30e2de228..4bbcd0dbe8f105268b9f253c5c676353a545d833
--- 1/sound/soc/fsl/fsl_sai.h
--- 2/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@@ -180,9 -267,10 +267,11 @@@ struct fsl_sai 
        unsigned int bclk_ratio;
  
        const struct fsl_sai_soc_data *soc_data;
 +      struct snd_soc_dai_driver cpu_dai_drv;
        struct snd_dmaengine_dai_dma_data dma_params_rx;
        struct snd_dmaengine_dai_dma_data dma_params_tx;
+       struct fsl_sai_verid verid;
+       struct fsl_sai_param param;
  };
  
  #define TX 1

diff --cc sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
Simple merge