From: Mark Brown <broonie@kernel.org>
Date: Mon, 18 Oct 2021 20:15:13 +0000 (+0100)
Subject: Merge branch 'asoc-5.15' into asoc-5.16
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bfceb9c2160109ef8c9305e0a726c7fe6cd9cd9e;p=linux.git

Merge branch 'asoc-5.15' into asoc-5.16
---

bfceb9c2160109ef8c9305e0a726c7fe6cd9cd9e
diff --cc sound/soc/codecs/cs42l42.c
index d484ec09eb2eb,ac145915445a9..5e4d6791756bc
--- a/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 |