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

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

Merge "ASoC: msm: add multimedia22 frontend in dai link"

parents d22f8219 6c052da6

asoc/sa6155.c

+17 −0
Original line number Diff line number Diff line
@@ -5867,6 +5867,23 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	{

		.name = MSM_DAILINK_NAME(Media22),

		.stream_name = "MultiMedia22",

		.cpu_dai_name = "MultiMedia22",

		.platform_name = "msm-pcm-dsp.0",

		.dynamic = 1,

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA22

	},

};



static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {

asoc/sa8155.c

+17 −0
Original line number Diff line number Diff line
@@ -5854,6 +5854,23 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	{

		.name = MSM_DAILINK_NAME(Media22),

		.stream_name = "MultiMedia22",

		.cpu_dai_name = "MultiMedia22",

		.platform_name = "msm-pcm-dsp.0",

		.dynamic = 1,

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA22

	},

};



static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {