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

Commit b2e69804 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: keep align of the FE pcm id"

parents 479e5455 267fb8e3

asoc/sa6155.c

100644 → 100755
+7 −7
Original line number Diff line number Diff line
@@ -5892,6 +5892,13 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { 
		.id = MSM_FRONTEND_DAI_MULTIMEDIA25,

		SND_SOC_DAILINK_REG(multimedia25),

	},

	{

		.name = "MSM AFE-PCM TX1",

		.stream_name = "AFE-PROXY TX1",

		.dpcm_capture = 1,

		.ignore_suspend = 1,

		SND_SOC_DAILINK_REG(afepcm_tx1),

	},

	{

		.name = MSM_DAILINK_NAME(Media31),

		.stream_name = "MultiMedia31",
@@ -5956,13 +5963,6 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { 
		.id = MSM_FRONTEND_DAI_MULTIMEDIA34,

		SND_SOC_DAILINK_REG(multimedia34),

	},

	{

		.name = "MSM AFE-PCM TX1",

		.stream_name = "AFE-PROXY TX1",

		.dpcm_capture = 1,

		.ignore_suspend = 1,

		SND_SOC_DAILINK_REG(afepcm_tx1),

	},

};



static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {

asoc/sa8155.c

100644 → 100755
+7 −7
Original line number Diff line number Diff line
@@ -5797,6 +5797,13 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { 
		.id = MSM_FRONTEND_DAI_MULTIMEDIA25,

		SND_SOC_DAILINK_REG(multimedia25),

	},

	{

		.name = "MSM AFE-PCM TX1",

		.stream_name = "AFE-PROXY TX1",

		.dpcm_capture = 1,

		.ignore_suspend = 1,

		SND_SOC_DAILINK_REG(afepcm_tx1),

	},

	{

		.name = MSM_DAILINK_NAME(Media31),

		.stream_name = "MultiMedia31",
@@ -5861,13 +5868,6 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { 
		.id = MSM_FRONTEND_DAI_MULTIMEDIA34,

		SND_SOC_DAILINK_REG(multimedia34),

	},

	{

		.name = "MSM AFE-PCM TX1",

		.stream_name = "AFE-PROXY TX1",

		.dpcm_capture = 1,

		.ignore_suspend = 1,

		SND_SOC_DAILINK_REG(afepcm_tx1),

	},

};



static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {