Merge branch 'asoc-5.9' into asoc-5.10

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

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

diff --cc sound/soc/codecs/tlv320aic32x4.c
index 470dc0e,ea8cd44..9e3de9d
--- 1/sound/soc/codecs/tlv320aic32x4.c
--- 2/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@@ -688,8 -665,7 +688,8 @@@ static int aic32x4_set_processing_block
  }
  
  static int aic32x4_setup_clocks(struct snd_soc_component *component,
-                               unsigned int sample_rate, unsigned int channel,
 -                              unsigned int sample_rate, unsigned int channels)
++                              unsigned int sample_rate, unsigned int channels,
 +                              unsigned int bit_depth)
  {
        u8 aosr;
        u16 dosr;
@@@ -777,8 -753,9 +777,9 @@@
                                                        dosr);
  
                                                clk_set_rate(clocks[5].clk,
-                                                       sample_rate * channel *
 -                                                      sample_rate * 32 *
 -                                                      channels);
++                                                      sample_rate * channels *
 +                                                      bit_depth);
+ 
                                                return 0;
                                        }
                                }