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

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

Merge "ASoC: mdm9630: Reorder Primary MI2S RX Hostless DAI"

parents 90b3e3b2 53c94ae4

sound/soc/msm/mdm9630.c

+3 −18
Original line number Diff line number Diff line
@@ -802,9 +802,9 @@ static struct snd_soc_dai_link mdm9630_dai[] = { 
		.be_id = MSM_FRONTEND_DAI_CS_VOICE,

	},

	{

		.name = "MI2S Hostless",

		.stream_name = "MI2S Hostless",

		.cpu_dai_name = "MI2S_TX_HOSTLESS",

		.name = "Primary MI2S RX Hostless",

		.stream_name = "Primary MI2S_RX Hostless Playback",

		.cpu_dai_name = "PRI_MI2S_RX_HOSTLESS",

		.platform_name  = "msm-pcm-hostless",

		.dynamic = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
@@ -812,7 +812,6 @@ static struct snd_soc_dai_link mdm9630_dai[] = { 
		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* This dainlink has MI2S support */

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

		.codec_name = "snd-soc-dummy",

	},
@@ -879,20 +878,6 @@ static struct snd_soc_dai_link mdm9630_dai[] = { 
		/* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA2,

	},

	{

		.name = "Primary MI2S RX Hostless",

		.stream_name = "Primary MI2S_RX Hostless Playback",

		.cpu_dai_name = "PRI_MI2S_RX_HOSTLESS",

		.platform_name  = "msm-pcm-hostless",

		.dynamic = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

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

		.codec_name = "snd-soc-dummy",

	},

	/* Backend DAI Links */

	{

		.name = LPASS_BE_PRI_MI2S_RX,