Unverified Commit 70b47699 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

ASoC: allow up to eight CPU/codec DAIs 



Sound card on Qualcomm X1E80100 CRD board will use eight DAIs in one DAI
link, so increase the limit.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20240117160144.1305127-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 35314e39

sound/soc/soc-core.c

+4 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card, 
	return -EINVAL;

}



#define MAX_DEFAULT_CH_MAP_SIZE 7

#define MAX_DEFAULT_CH_MAP_SIZE 8

static struct snd_soc_dai_link_ch_map default_ch_map_sync[MAX_DEFAULT_CH_MAP_SIZE] = {

	{ .cpu = 0, .codec = 0 },

	{ .cpu = 1, .codec = 1 },
@@ -1046,6 +1046,7 @@ static struct snd_soc_dai_link_ch_map default_ch_map_sync[MAX_DEFAULT_CH_MAP_SIZ 
	{ .cpu = 4, .codec = 4 },

	{ .cpu = 5, .codec = 5 },

	{ .cpu = 6, .codec = 6 },

	{ .cpu = 7, .codec = 7 },

};

static struct snd_soc_dai_link_ch_map default_ch_map_1cpu[MAX_DEFAULT_CH_MAP_SIZE] = {

	{ .cpu = 0, .codec = 0 },
@@ -1055,6 +1056,7 @@ static struct snd_soc_dai_link_ch_map default_ch_map_1cpu[MAX_DEFAULT_CH_MAP_SIZ 
	{ .cpu = 0, .codec = 4 },

	{ .cpu = 0, .codec = 5 },

	{ .cpu = 0, .codec = 6 },

	{ .cpu = 0, .codec = 7 },

};

static struct snd_soc_dai_link_ch_map default_ch_map_1codec[MAX_DEFAULT_CH_MAP_SIZE] = {

	{ .cpu = 0, .codec = 0 },
@@ -1064,6 +1066,7 @@ static struct snd_soc_dai_link_ch_map default_ch_map_1codec[MAX_DEFAULT_CH_MAP_S 
	{ .cpu = 4, .codec = 0 },

	{ .cpu = 5, .codec = 0 },

	{ .cpu = 6, .codec = 0 },

	{ .cpu = 7, .codec = 0 },

};

static int snd_soc_compensate_channel_connection_map(struct snd_soc_card *card,

						     struct snd_soc_dai_link *dai_link)