ASoC: Merge fixes due to dependencies

So we can apply the tlv320aic3xxx DT conversion.

diff --cc drivers/firmware/cirrus/cs_dsp.c
Simple merge

diff --cc sound/soc/amd/ps/pci-ps.c
Simple merge

diff --cc sound/soc/amd/ps/ps-pdm-dma.c
Simple merge

diff --cc sound/soc/amd/yc/acp6x-mach.c
Simple merge

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

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

diff --cc sound/soc/codecs/rt5682-i2c.c
Simple merge

diff --cc sound/soc/codecs/rt5682.h
Simple merge

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

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

diff --cc sound/soc/dwc/dwc-i2s.c
Simple merge

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

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

diff --cc sound/soc/generic/simple-card-utils.c
Simple merge

diff --cc sound/soc/mediatek/mt8188/mt8188-afe-clk.c
Simple merge

diff --cc sound/soc/mediatek/mt8188/mt8188-afe-clk.h
index 904505d,a4203a8..ec53c17
--- 1/sound/soc/mediatek/mt8188/mt8188-afe-clk.h
--- 2/sound/soc/mediatek/mt8188/mt8188-afe-clk.h
+++ b/sound/soc/mediatek/mt8188/mt8188-afe-clk.h
@@@ -108,10 -99,7 +108,9 @@@ struct mtk_base_afe
  int mt8188_afe_get_mclk_source_clk_id(int sel);
  int mt8188_afe_get_mclk_source_rate(struct mtk_base_afe *afe, int apll);
  int mt8188_afe_get_default_mclk_source_by_rate(int rate);
 +int mt8188_get_apll_by_rate(struct mtk_base_afe *afe, int rate);
 +int mt8188_get_apll_by_name(struct mtk_base_afe *afe, const char *name);
  int mt8188_afe_init_clock(struct mtk_base_afe *afe);
- void mt8188_afe_deinit_clock(void *priv);
  int mt8188_afe_enable_clk(struct mtk_base_afe *afe, struct clk *clk);
  void mt8188_afe_disable_clk(struct mtk_base_afe *afe, struct clk *clk);
  int mt8188_afe_set_clk_rate(struct mtk_base_afe *afe, struct clk *clk,

diff --cc sound/soc/mediatek/mt8188/mt8188-afe-pcm.c
Simple merge

diff --cc sound/soc/mediatek/mt8195/mt8195-afe-pcm.c
Simple merge

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