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

Commit 67b09c4d authored by Venkat Sudhir's avatar Venkat Sudhir
Browse files

ASoC: msm8974: Rearrange Listen DAI links 



Move Listen DAI links to the end of existing
Front-End DAI links in machine driver. This
change is required to avoid issues with PCM
device ID with other FE after Listen.

Change-Id: I2e4118096802f79a9bf105180f186b228c8cd21e
Signed-off-by: default avatarVenkat Sudhir <vsudhir@codeaurora.org>
parent 360013b1

sound/soc/msm/msm8974.c

+38 −38
Original line number Diff line number Diff line
@@ -2251,6 +2251,44 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA6,

	},

	/* End of FE DAI LINK */

	{

		.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 = &msm8974_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 = &msm8974_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 = &msm8974_slimbus_2_be_ops,

	},

	/* LSM FE */

	{

		.name = "Listen 2 Audio Service",
@@ -2357,44 +2395,6 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = { 
		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_LSM8,

	},

	/* End of FE DAI LINK */

	{

		.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 = &msm8974_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 = &msm8974_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 = &msm8974_slimbus_2_be_ops,

	},

	/* Backend BT/FM DAI Links */

	{

		.name = LPASS_BE_INT_BT_SCO_RX,