Merge "ASoC: msm: update listen service dai to low latency pcm" (8d9b6ddf) · Commits · e / devices / android_kernel_sony_msm8998

sound/soc/msm/apq8096-auto.c

+13 −11

Original line number	Diff line number	Diff line
		@@ -5122,20 +5122,22 @@ static struct snd_soc_dai_link apq8096_common_dai_links[] = {
		.be_id = MSM_FRONTEND_DAI_LSM7,
		},
		{
		.name = "Listen 8 Audio Service",
		.stream_name = "Listen 8 Audio Service",
		.cpu_dai_name = "LSM8",
		.platform_name = "msm-lsm-client",
		.name = "MSM8996 LowLatency2",
		.stream_name = "MultiMedia22",
		.cpu_dai_name = "MultiMedia22",
		.platform_name = "msm-pcm-dsp.1",
		.dynamic = 1,
		.dpcm_capture = 1,
		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
		.dpcm_playback = 1,
		.codec_dai_name = "snd-soc-dummy-dai",
		.codec_name = "snd-soc-dummy",
		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
		SND_SOC_DPCM_TRIGGER_POST},
		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
		.ignore_suspend = 1,
		/* this dainlink has playback support */
		.ignore_pmdown_time = 1,
		.codec_dai_name = "snd-soc-dummy-dai",
		.codec_name = "snd-soc-dummy",
		.be_id = MSM_FRONTEND_DAI_LSM8,
		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA22,
		.ops = &apq8096_ll_ops,
		},
		{
		.name = "MSM8996 LowLatency Loopback",

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+68 −38

Original line number	Diff line number	Diff line
		@@ -5844,6 +5844,9 @@ static const struct snd_kcontrol_new pri_tdm_rx_0_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_PRI_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_PRI_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_PRI_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -5901,6 +5904,9 @@ static const struct snd_kcontrol_new pri_tdm_rx_1_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_PRI_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_PRI_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_PRI_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -5958,6 +5964,9 @@ static const struct snd_kcontrol_new pri_tdm_rx_2_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_PRI_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_PRI_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_PRI_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6015,6 +6024,9 @@ static const struct snd_kcontrol_new pri_tdm_rx_3_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_PRI_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_PRI_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_PRI_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6123,6 +6135,9 @@ static const struct snd_kcontrol_new sec_tdm_rx_0_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_SEC_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_SEC_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_SEC_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6180,6 +6195,9 @@ static const struct snd_kcontrol_new sec_tdm_rx_1_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_SEC_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_SEC_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_SEC_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6237,6 +6255,9 @@ static const struct snd_kcontrol_new sec_tdm_rx_2_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_SEC_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_SEC_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_SEC_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6294,6 +6315,9 @@ static const struct snd_kcontrol_new sec_tdm_rx_3_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_SEC_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_SEC_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_SEC_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6402,6 +6426,9 @@ static const struct snd_kcontrol_new tert_tdm_rx_0_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_TERT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_TERT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_TERT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6510,6 +6537,9 @@ static const struct snd_kcontrol_new tert_tdm_rx_1_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_TERT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_TERT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_TERT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6567,6 +6597,9 @@ static const struct snd_kcontrol_new tert_tdm_rx_2_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_TERT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_TERT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_TERT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6624,6 +6657,9 @@ static const struct snd_kcontrol_new tert_tdm_rx_3_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_TERT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_TERT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_TERT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6681,6 +6717,9 @@ static const struct snd_kcontrol_new tert_tdm_rx_4_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_TERT_TDM_RX_4,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_TERT_TDM_RX_4,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_TERT_TDM_RX_4,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6741,6 +6780,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_0_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6852,6 +6894,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_1_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6912,6 +6957,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_2_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -6972,6 +7020,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_3_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia22", MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -13780,6 +13831,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"PRI_TDM_RX_0", NULL, "PRI_TDM_RX_0 Audio Mixer"},

		@@ -13800,6 +13852,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"PRI_TDM_RX_1 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"PRI_TDM_RX_1 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"PRI_TDM_RX_1 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"PRI_TDM_RX_1 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"PRI_TDM_RX_1 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"PRI_TDM_RX_1", NULL, "PRI_TDM_RX_1 Audio Mixer"},

		@@ -13820,6 +13873,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"PRI_TDM_RX_2 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"PRI_TDM_RX_2 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"PRI_TDM_RX_2 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"PRI_TDM_RX_2 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"PRI_TDM_RX_2 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"PRI_TDM_RX_2", NULL, "PRI_TDM_RX_2 Audio Mixer"},

		@@ -13840,6 +13894,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"PRI_TDM_RX_3 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"PRI_TDM_RX_3 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"PRI_TDM_RX_3 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"PRI_TDM_RX_3 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"PRI_TDM_RX_3 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"PRI_TDM_RX_3", NULL, "PRI_TDM_RX_3 Audio Mixer"},

		@@ -13878,6 +13933,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"SEC_TDM_RX_0", NULL, "SEC_TDM_RX_0 Audio Mixer"},

		@@ -13898,6 +13954,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SEC_TDM_RX_1 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"SEC_TDM_RX_1 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"SEC_TDM_RX_1 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"SEC_TDM_RX_1 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"SEC_TDM_RX_1 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"SEC_TDM_RX_1", NULL, "SEC_TDM_RX_1 Audio Mixer"},

		@@ -13918,6 +13975,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SEC_TDM_RX_2 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"SEC_TDM_RX_2 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"SEC_TDM_RX_2 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"SEC_TDM_RX_2 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"SEC_TDM_RX_2 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"SEC_TDM_RX_2", NULL, "SEC_TDM_RX_2 Audio Mixer"},

		@@ -13938,6 +13996,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SEC_TDM_RX_3 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"SEC_TDM_RX_3 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"SEC_TDM_RX_3 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"SEC_TDM_RX_3 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"SEC_TDM_RX_3 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"SEC_TDM_RX_3", NULL, "SEC_TDM_RX_3 Audio Mixer"},

		@@ -13976,6 +14035,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"TERT_TDM_RX_0 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"TERT_TDM_RX_0 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"TERT_TDM_RX_0 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"TERT_TDM_RX_0 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"TERT_TDM_RX_0 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"TERT_TDM_RX_0", NULL, "TERT_TDM_RX_0 Audio Mixer"},

		@@ -14014,6 +14074,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"TERT_TDM_RX_1 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"TERT_TDM_RX_1 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"TERT_TDM_RX_1 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"TERT_TDM_RX_1 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"TERT_TDM_RX_1 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"TERT_TDM_RX_1", NULL, "TERT_TDM_RX_1 Audio Mixer"},

		@@ -14034,6 +14095,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"TERT_TDM_RX_2 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"TERT_TDM_RX_2 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"TERT_TDM_RX_2 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"TERT_TDM_RX_2 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"TERT_TDM_RX_2 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"TERT_TDM_RX_2", NULL, "TERT_TDM_RX_2 Audio Mixer"},

		@@ -14054,6 +14116,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"TERT_TDM_RX_3 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"TERT_TDM_RX_3 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"TERT_TDM_RX_3 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"TERT_TDM_RX_3 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"TERT_TDM_RX_3 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"TERT_TDM_RX_3", NULL, "TERT_TDM_RX_3 Audio Mixer"},

		@@ -14074,6 +14137,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"TERT_TDM_RX_4", NULL, "TERT_TDM_RX_4 Audio Mixer"},

		@@ -14095,47 +14159,10 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia20", "MM_DL20"},
		{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"QUAT_TDM_RX_0", NULL, "QUAT_TDM_RX_0 Audio Mixer"},

		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia1", "MM_DL1"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia2", "MM_DL2"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia3", "MM_DL3"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia4", "MM_DL4"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia5", "MM_DL5"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia6", "MM_DL6"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia7", "MM_DL7"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia8", "MM_DL8"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia9", "MM_DL9"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia10", "MM_DL10"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia11", "MM_DL11"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia12", "MM_DL12"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia13", "MM_DL13"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"PRI_TDM_RX_0", NULL, "PRI_TDM_RX_0 Audio Mixer"},

		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia1", "MM_DL1"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia2", "MM_DL2"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia3", "MM_DL3"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia4", "MM_DL4"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia5", "MM_DL5"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia6", "MM_DL6"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia7", "MM_DL7"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia8", "MM_DL8"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia9", "MM_DL9"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia10", "MM_DL10"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia11", "MM_DL11"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia12", "MM_DL12"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia13", "MM_DL13"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"SEC_TDM_RX_0", NULL, "SEC_TDM_RX_0 Audio Mixer"},

		{"QUAT_TDM_TX_0 Audio Mixer", "MultiMedia1", "MM_DL1"},
		{"QUAT_TDM_TX_0 Audio Mixer", "MultiMedia2", "MM_DL2"},
		{"QUAT_TDM_TX_0 Audio Mixer", "MultiMedia3", "MM_DL3"},
		@@ -14172,6 +14199,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"QUAT_TDM_RX_1 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"QUAT_TDM_RX_1 Audio Mixer", "MultiMedia20", "MM_DL20"},
		{"QUAT_TDM_RX_1 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"QUAT_TDM_RX_1 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"QUAT_TDM_RX_1 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"QUAT_TDM_RX_1", NULL, "QUAT_TDM_RX_1 Audio Mixer"},

		@@ -14193,6 +14221,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia20", "MM_DL20"},
		{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"QUAT_TDM_RX_2", NULL, "QUAT_TDM_RX_2 Audio Mixer"},

		@@ -14214,6 +14243,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia20", "MM_DL20"},
		{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia22", "MM_DL22"},
		{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia26", "MM_DL26"},
		{"QUAT_TDM_RX_3", NULL, "QUAT_TDM_RX_3 Audio Mixer"},