Merge branch 'asoc-5.15' into asoc-5.16

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

diff --cc sound/soc/codecs/cs42l42.c
index d484ec09eb2ebbbf9407b0347d2c333d610fbb95,ac145915445a9d0131bc61c7c2076221c532471b..5e4d6791756bcc01b4c002b054e890188805f2d1
--- 1/sound/soc/codecs/cs42l42.c
--- 2/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@@ -851,13 -873,12 +873,12 @@@ static int cs42l42_pcm_hw_params(struc
        if (params_width(params) == 24)
                cs42l42->bclk = (cs42l42->bclk / 3) * 4;
  
 -      switch(substream->stream) {
 +      switch (substream->stream) {
        case SNDRV_PCM_STREAM_CAPTURE:
-               if (channels == 2) {
-                       val |= CS42L42_ASP_TX_CH2_AP_MASK;
-                       val |= width << CS42L42_ASP_TX_CH2_RES_SHIFT;
-               }
-               val |= width << CS42L42_ASP_TX_CH1_RES_SHIFT;
+               /* channel 2 on high LRCLK */
+               val = CS42L42_ASP_TX_CH2_AP_MASK |
+                     (width << CS42L42_ASP_TX_CH2_RES_SHIFT) |
+                     (width << CS42L42_ASP_TX_CH1_RES_SHIFT);
  
                snd_soc_component_update_bits(component, CS42L42_ASP_TX_CH_AP_RES,
                                CS42L42_ASP_TX_CH1_AP_MASK | CS42L42_ASP_TX_CH2_AP_MASK |

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

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

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

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