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

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

Merge "ASoC: apq8084: Rearrange Listen DAI links"

parents 7df83b54 08589a51

sound/soc/msm/apq8084.c

+52 −52
Original line number Diff line number Diff line
@@ -2537,6 +2537,58 @@ static struct snd_soc_dai_link apq8084_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA6,

	},

	{

		.name = LPASS_BE_SLIMBUS_4_TX,

		.stream_name = "Slimbus4 Capture",

		.cpu_dai_name = "msm-dai-q6-dev.16393",

		.platform_name = "msm-pcm-hostless",

		.codec_name = "taiko_codec",

		.codec_dai_name	= "taiko_vifeedback",

		.be_id = MSM_BACKEND_DAI_SLIMBUS_4_TX,

		.be_hw_params_fixup = msm_slim_4_tx_be_hw_params_fixup,

		.ops = &apq8084_be_ops,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

	},

	/* Ultrasound RX Back End DAI Link */

	{

		.name = "SLIMBUS_2 Hostless Playback",

		.stream_name = "SLIMBUS_2 Hostless Playback",

		.cpu_dai_name = "msm-dai-q6-dev.16388",

		.platform_name = "msm-pcm-hostless",

		.codec_name = "taiko_codec",

		.codec_dai_name = "taiko_rx2",

		.ignore_suspend = 1,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ops = &apq8084_slimbus_2_be_ops,

	},

	/* Ultrasound TX Back End DAI Link */

	{

		.name = "SLIMBUS_2 Hostless Capture",

		.stream_name = "SLIMBUS_2 Hostless Capture",

		.cpu_dai_name = "msm-dai-q6-dev.16389",

		.platform_name = "msm-pcm-hostless",

		.codec_name = "taiko_codec",

		.codec_dai_name = "taiko_tx2",

		.ignore_suspend = 1,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ops = &apq8084_slimbus_2_be_ops,

	},

	{

		.name = "Voice2 Stub",

		.stream_name = "Voice2 Stub",

		.cpu_dai_name = "VOICE2_STUB",

		.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,

		/* this dainlink has playback support */

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

		.codec_name = "snd-soc-dummy",

	},

	{

		.name = "Listen 2 Audio Service",

		.stream_name = "Listen 2 Audio Service",
@@ -2642,58 +2694,6 @@ static struct snd_soc_dai_link apq8084_common_dai_links[] = { 
		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_LSM8,

	},

	{

		.name = LPASS_BE_SLIMBUS_4_TX,

		.stream_name = "Slimbus4 Capture",

		.cpu_dai_name = "msm-dai-q6-dev.16393",

		.platform_name = "msm-pcm-hostless",

		.codec_name = "taiko_codec",

		.codec_dai_name	= "taiko_vifeedback",

		.be_id = MSM_BACKEND_DAI_SLIMBUS_4_TX,

		.be_hw_params_fixup = msm_slim_4_tx_be_hw_params_fixup,

		.ops = &apq8084_be_ops,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

	},

	/* Ultrasound RX Back End DAI Link */

	{

		.name = "SLIMBUS_2 Hostless Playback",

		.stream_name = "SLIMBUS_2 Hostless Playback",

		.cpu_dai_name = "msm-dai-q6-dev.16388",

		.platform_name = "msm-pcm-hostless",

		.codec_name = "taiko_codec",

		.codec_dai_name = "taiko_rx2",

		.ignore_suspend = 1,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ops = &apq8084_slimbus_2_be_ops,

	},

	/* Ultrasound TX Back End DAI Link */

	{

		.name = "SLIMBUS_2 Hostless Capture",

		.stream_name = "SLIMBUS_2 Hostless Capture",

		.cpu_dai_name = "msm-dai-q6-dev.16389",

		.platform_name = "msm-pcm-hostless",

		.codec_name = "taiko_codec",

		.codec_dai_name = "taiko_tx2",

		.ignore_suspend = 1,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ops = &apq8084_slimbus_2_be_ops,

	},

	{

		.name = "Voice2 Stub",

		.stream_name = "Voice2 Stub",

		.cpu_dai_name = "VOICE2_STUB",

		.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,

		/* this dainlink has playback support */

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

		.codec_name = "snd-soc-dummy",

	},

	/* Backend AFE DAI Links */

	{

		.name = LPASS_BE_AFE_PCM_RX,