Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cf68e0a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: sdm845: Add asm loopback FE DAI" into msm-4.9

parents 0949c975 39041e1d

sound/soc/msm/sdm845.c

+29 −4
Original line number Diff line number Diff line
@@ -4655,6 +4655,26 @@ static struct snd_soc_dai_link msm_tavil_fe_dai_links[] = { 
	},

};



static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = {

	{

		.name = MSM_DAILINK_NAME(ASM Loopback),

		.stream_name = "MultiMedia6",

		.cpu_dai_name = "MultiMedia6",

		.platform_name = "msm-pcm-loopback",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA6,

	},

};



static struct snd_soc_dai_link msm_common_be_dai_links[] = {

	/* Backend AFE DAI Links */

	{
@@ -5373,6 +5393,7 @@ static struct snd_soc_dai_link msm_auxpcm_be_dai_links[] = { 
static struct snd_soc_dai_link msm_tavil_snd_card_dai_links[

			 ARRAY_SIZE(msm_common_dai_links) +

			 ARRAY_SIZE(msm_tavil_fe_dai_links) +

			 ARRAY_SIZE(msm_common_misc_fe_dai_links) +

			 ARRAY_SIZE(msm_common_be_dai_links) +

			 ARRAY_SIZE(msm_tavil_be_dai_links) +

			 ARRAY_SIZE(msm_wcn_be_dai_links) +
@@ -5662,7 +5683,7 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
{

	struct snd_soc_card *card = NULL;

	struct snd_soc_dai_link *dailink;

	int len_1, len_2, len_3;

	int len_1, len_2, len_3, len_4;

	int total_links;

	const struct of_device_id *match;
@@ -5677,8 +5698,9 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
		card = &snd_soc_card_tavil_msm;

		len_1 = ARRAY_SIZE(msm_common_dai_links);

		len_2 = len_1 + ARRAY_SIZE(msm_tavil_fe_dai_links);

		len_3 = len_2 + ARRAY_SIZE(msm_common_be_dai_links);

		total_links = len_3 + ARRAY_SIZE(msm_tavil_be_dai_links);

		len_3 = len_2 + ARRAY_SIZE(msm_common_misc_fe_dai_links);

		len_4 = len_3 + ARRAY_SIZE(msm_common_be_dai_links);

		total_links = len_4 + ARRAY_SIZE(msm_tavil_be_dai_links);

		memcpy(msm_tavil_snd_card_dai_links,

		       msm_common_dai_links,

		       sizeof(msm_common_dai_links));
@@ -5686,9 +5708,12 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
		       msm_tavil_fe_dai_links,

		       sizeof(msm_tavil_fe_dai_links));

		memcpy(msm_tavil_snd_card_dai_links + len_2,

		       msm_common_misc_fe_dai_links,

		       sizeof(msm_common_misc_fe_dai_links));

		memcpy(msm_tavil_snd_card_dai_links + len_3,

		       msm_common_be_dai_links,

		       sizeof(msm_common_be_dai_links));

		memcpy(msm_tavil_snd_card_dai_links + len_3,

		memcpy(msm_tavil_snd_card_dai_links + len_4,

		       msm_tavil_be_dai_links,

		       sizeof(msm_tavil_be_dai_links));