[PATCH] ASoC: Intel: cirrus-common: fix incorrect channel mapping

Brent Lu brent.lu at intel.com
Mon May 30 14:54:21 CEST 2022


From: xliu <xiang.liu at cirrus.com>

The default mapping of ASPRX1 Slot is left channel. Map the slots of
right amplifiers (WR and TR) to right channel.

Signed-off-by: xliu <xiang.liu at cirrus.com>
Signed-off-by: Brent Lu <brent.lu at intel.com>
---
 sound/soc/intel/boards/sof_cirrus_common.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sound/soc/intel/boards/sof_cirrus_common.c b/sound/soc/intel/boards/sof_cirrus_common.c
index e71d74ec1b0b..64ca0e3991dc 100644
--- a/sound/soc/intel/boards/sof_cirrus_common.c
+++ b/sound/soc/intel/boards/sof_cirrus_common.c
@@ -107,6 +107,7 @@ static int cs35l41_hw_params(struct snd_pcm_substream *substream,
 	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
 	struct snd_soc_dai *codec_dai;
 	int clk_freq, i, ret;
+	int rx_ch[2] = {1, 0};
 
 	clk_freq = sof_dai_get_bclk(rtd); /* BCLK freq */
 
@@ -134,6 +135,17 @@ static int cs35l41_hw_params(struct snd_pcm_substream *substream,
 				ret);
 			return ret;
 		}
+
+		/* Setup for R channel Slot: WR and TR */
+		if (i % 2) {
+			ret = snd_soc_dai_set_channel_map(codec_dai, 0, NULL,
+							  ARRAY_SIZE(rx_ch), rx_ch);
+			if (ret < 0) {
+				dev_err(codec_dai->dev, "fail to set channel map, ret %d\n",
+					ret);
+				return ret;
+			}
+		}
 	}
 
 	return 0;
-- 
2.25.1



More information about the Alsa-devel mailing list