Merge "ASoC: msm: qdsp6v2: Add MultiMedia21 capture and routing" (64acc911) · Commits · e / devices / android_kernel_sony_msm8998

sound/soc/msm/msm-dai-fe.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -2656,6 +2656,20 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
		.rate_min = 8000,
		.rate_max = 384000,
		},
		.capture = {
		.stream_name = "MultiMedia21 Capture",
		.aif_name = "MM_UL21",
		.rates = (SNDRV_PCM_RATE_8000_48000\|
		SNDRV_PCM_RATE_KNOT),
		.formats = (SNDRV_PCM_FMTBIT_S16_LE \|
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S24_3LE \|
		SNDRV_PCM_FMTBIT_S32_LE),
		.channels_min = 1,
		.channels_max = 8,
		.rate_min = 8000,
		.rate_max = 48000,
		},
		.ops = &msm_fe_Multimedia_dai_ops,
		.name = "MultiMedia21",
		.probe = fe_dai_probe,

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

+175 −0

Original line number	Diff line number	Diff line
		@@ -603,6 +603,21 @@ static struct msm_pcm_routing_fdai_data
		{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
		{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
		/* MULTIMEDIA20 */
		{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
		{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
		/* MULTIMEDIA21 */
		{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
		{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
		/* MULTIMEDIA22 */
		{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
		{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
		/* MULTIMEDIA23 */
		{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
		{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
		/* MULTIMEDIA24 */
		{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
		{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
		/* MULTIMEDIA25 */
		{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
		{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
		/* CS_VOICE */
		@@ -5227,6 +5242,9 @@ static const struct snd_kcontrol_new auxpcm_rx_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_AUXPCM_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_AUXPCM_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new sec_auxpcm_rx_mixer_controls[] = {
		@@ -5287,6 +5305,9 @@ static const struct snd_kcontrol_new sec_auxpcm_rx_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_SEC_AUXPCM_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia21", MSM_BACKEND_DAI_SEC_AUXPCM_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new tert_auxpcm_rx_mixer_controls[] = {
		@@ -5440,6 +5461,9 @@ static const struct snd_kcontrol_new pri_tdm_rx_0_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_PRI_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new pri_tdm_rx_1_mixer_controls[] = {
		@@ -5491,6 +5515,9 @@ static const struct snd_kcontrol_new pri_tdm_rx_1_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_PRI_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new pri_tdm_rx_2_mixer_controls[] = {
		@@ -5542,6 +5569,9 @@ static const struct snd_kcontrol_new pri_tdm_rx_2_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_PRI_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new pri_tdm_rx_3_mixer_controls[] = {
		@@ -5593,6 +5623,9 @@ static const struct snd_kcontrol_new pri_tdm_rx_3_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_PRI_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new pri_tdm_tx_0_mixer_controls[] = {
		@@ -5695,6 +5728,9 @@ static const struct snd_kcontrol_new sec_tdm_rx_0_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_SEC_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new sec_tdm_rx_1_mixer_controls[] = {
		@@ -5746,6 +5782,9 @@ static const struct snd_kcontrol_new sec_tdm_rx_1_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_SEC_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new sec_tdm_rx_2_mixer_controls[] = {
		@@ -5797,6 +5836,9 @@ static const struct snd_kcontrol_new sec_tdm_rx_2_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_SEC_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new sec_tdm_rx_3_mixer_controls[] = {
		@@ -5848,6 +5890,9 @@ static const struct snd_kcontrol_new sec_tdm_rx_3_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_SEC_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new sec_tdm_tx_0_mixer_controls[] = {
		@@ -5950,6 +5995,9 @@ static const struct snd_kcontrol_new tert_tdm_rx_0_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_TERT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new tert_tdm_tx_0_mixer_controls[] = {
		@@ -6052,6 +6100,9 @@ static const struct snd_kcontrol_new tert_tdm_rx_1_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_TERT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new tert_tdm_rx_2_mixer_controls[] = {
		@@ -6103,6 +6154,9 @@ static const struct snd_kcontrol_new tert_tdm_rx_2_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_TERT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new tert_tdm_rx_3_mixer_controls[] = {
		@@ -6154,6 +6208,9 @@ static const struct snd_kcontrol_new tert_tdm_rx_3_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_TERT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new tert_tdm_rx_4_mixer_controls[] = {
		@@ -6205,6 +6262,9 @@ static const struct snd_kcontrol_new tert_tdm_rx_4_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_TERT_TDM_RX_4,
		MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new quat_tdm_rx_0_mixer_controls[] = {
		@@ -6259,6 +6319,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_0_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia20", MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new quat_tdm_tx_0_mixer_controls[] = {
		@@ -6364,6 +6427,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_1_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia20", MSM_BACKEND_DAI_QUAT_TDM_RX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new quat_tdm_rx_2_mixer_controls[] = {
		@@ -6418,6 +6484,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_2_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia20", MSM_BACKEND_DAI_QUAT_TDM_RX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new quat_tdm_rx_3_mixer_controls[] = {
		@@ -6472,6 +6541,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_3_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia20", MSM_BACKEND_DAI_QUAT_TDM_RX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		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),
		};

		static const struct snd_kcontrol_new mmul1_mixer_controls[] = {
		@@ -7350,6 +7422,63 @@ static const struct snd_kcontrol_new mmul20_mixer_controls[] = {
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new mmul21_mixer_controls[] = {
		SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SEC_AUX_PCM_UL_TX", MSM_BACKEND_DAI_SEC_AUXPCM_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("PRI_TDM_TX_0", MSM_BACKEND_DAI_PRI_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("PRI_TDM_TX_1", MSM_BACKEND_DAI_PRI_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("PRI_TDM_TX_2", MSM_BACKEND_DAI_PRI_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("PRI_TDM_TX_3", MSM_BACKEND_DAI_PRI_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SEC_TDM_TX_0", MSM_BACKEND_DAI_SEC_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SEC_TDM_TX_1", MSM_BACKEND_DAI_SEC_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SEC_TDM_TX_2", MSM_BACKEND_DAI_SEC_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("SEC_TDM_TX_3", MSM_BACKEND_DAI_SEC_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("TERT_TDM_TX_0", MSM_BACKEND_DAI_TERT_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("TERT_TDM_TX_1", MSM_BACKEND_DAI_TERT_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("TERT_TDM_TX_2", MSM_BACKEND_DAI_TERT_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("TERT_TDM_TX_3", MSM_BACKEND_DAI_TERT_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("QUAT_TDM_TX_0", MSM_BACKEND_DAI_QUAT_TDM_TX_0,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("QUAT_TDM_TX_1", MSM_BACKEND_DAI_QUAT_TDM_TX_1,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("QUAT_TDM_TX_2", MSM_BACKEND_DAI_QUAT_TDM_TX_2,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("QUAT_TDM_TX_3", MSM_BACKEND_DAI_QUAT_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new pri_rx_voice_mixer_controls[] = {
		SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_PRI_I2S_RX,
		MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer,
		@@ -11470,6 +11599,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		SND_SOC_DAPM_AIF_OUT("MM_UL18", "MultiMedia18 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("MM_UL19", "MultiMedia19 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("MM_UL20", "MultiMedia20 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("MM_UL21", "MultiMedia21 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("CS-VOICE_DL1", "CS-VOICE Playback", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("CS-VOICE_UL1", "CS-VOICE Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("VOICE2_DL", "Voice2 Playback", 0, 0, 0, 0),
		@@ -12210,6 +12340,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		mmul19_mixer_controls, ARRAY_SIZE(mmul19_mixer_controls)),
		SND_SOC_DAPM_MIXER("MultiMedia20 Mixer", SND_SOC_NOPM, 0, 0,
		mmul20_mixer_controls, ARRAY_SIZE(mmul20_mixer_controls)),
		SND_SOC_DAPM_MIXER("MultiMedia21 Mixer", SND_SOC_NOPM, 0, 0,
		mmul21_mixer_controls, ARRAY_SIZE(mmul21_mixer_controls)),
		SND_SOC_DAPM_MIXER("AUX_PCM_RX Audio Mixer", SND_SOC_NOPM, 0, 0,
		auxpcm_rx_mixer_controls, ARRAY_SIZE(auxpcm_rx_mixer_controls)),
		SND_SOC_DAPM_MIXER("SEC_AUX_PCM_RX Audio Mixer", SND_SOC_NOPM, 0, 0,
		@@ -12964,6 +13096,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"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", "MultiMedia21", "MM_DL21"},
		{"PRI_TDM_RX_0", NULL, "PRI_TDM_RX_0 Audio Mixer"},

		{"PRI_TDM_RX_1 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -12982,6 +13115,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"PRI_TDM_RX_1 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"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", NULL, "PRI_TDM_RX_1 Audio Mixer"},

		{"PRI_TDM_RX_2 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13000,6 +13134,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"PRI_TDM_RX_2 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"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", NULL, "PRI_TDM_RX_2 Audio Mixer"},

		{"PRI_TDM_RX_3 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13018,6 +13153,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"PRI_TDM_RX_3 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"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", NULL, "PRI_TDM_RX_3 Audio Mixer"},

		{"PRI_TDM_TX_0 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13054,6 +13190,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"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", "MultiMedia21", "MM_DL21"},
		{"SEC_TDM_RX_0", NULL, "SEC_TDM_RX_0 Audio Mixer"},

		{"SEC_TDM_RX_1 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13072,6 +13209,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SEC_TDM_RX_1 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"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", NULL, "SEC_TDM_RX_1 Audio Mixer"},

		{"SEC_TDM_RX_2 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13090,6 +13228,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SEC_TDM_RX_2 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"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", NULL, "SEC_TDM_RX_2 Audio Mixer"},

		{"SEC_TDM_RX_3 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13108,6 +13247,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SEC_TDM_RX_3 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"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", NULL, "SEC_TDM_RX_3 Audio Mixer"},

		{"SEC_TDM_TX_0 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13144,6 +13284,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"TERT_TDM_RX_0 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"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", NULL, "TERT_TDM_RX_0 Audio Mixer"},

		{"TERT_TDM_TX_0 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13180,6 +13321,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"TERT_TDM_RX_1 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"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", NULL, "TERT_TDM_RX_1 Audio Mixer"},

		{"TERT_TDM_RX_2 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13198,6 +13340,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"TERT_TDM_RX_2 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"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", NULL, "TERT_TDM_RX_2 Audio Mixer"},

		{"TERT_TDM_RX_3 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13216,6 +13359,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"TERT_TDM_RX_3 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"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", NULL, "TERT_TDM_RX_3 Audio Mixer"},

		{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13234,6 +13378,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"TERT_TDM_RX_4 Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"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", NULL, "TERT_TDM_RX_4 Audio Mixer"},

		{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13253,6 +13398,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"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", NULL, "QUAT_TDM_RX_0 Audio Mixer"},

		{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13326,6 +13472,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"QUAT_TDM_RX_1 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"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", NULL, "QUAT_TDM_RX_1 Audio Mixer"},

		{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13345,6 +13492,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"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", NULL, "QUAT_TDM_RX_2 Audio Mixer"},

		{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13364,6 +13512,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"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", NULL, "QUAT_TDM_RX_3 Audio Mixer"},

		{"MultiMedia1 Mixer", "PRI_TX", "PRI_I2S_TX"},
		@@ -13566,6 +13715,25 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MultiMedia20 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},
		{"MultiMedia20 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},

		{"MultiMedia21 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
		{"MultiMedia21 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
		{"MultiMedia21 Mixer", "PRI_TDM_TX_2", "PRI_TDM_TX_2"},
		{"MultiMedia21 Mixer", "PRI_TDM_TX_3", "PRI_TDM_TX_3"},
		{"MultiMedia21 Mixer", "SEC_TDM_TX_0", "SEC_TDM_TX_0"},
		{"MultiMedia21 Mixer", "SEC_TDM_TX_1", "SEC_TDM_TX_1"},
		{"MultiMedia21 Mixer", "SEC_TDM_TX_2", "SEC_TDM_TX_2"},
		{"MultiMedia21 Mixer", "SEC_TDM_TX_3", "SEC_TDM_TX_3"},
		{"MultiMedia21 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},
		{"MultiMedia21 Mixer", "TERT_TDM_TX_1", "TERT_TDM_TX_1"},
		{"MultiMedia21 Mixer", "TERT_TDM_TX_2", "TERT_TDM_TX_2"},
		{"MultiMedia21 Mixer", "TERT_TDM_TX_3", "TERT_TDM_TX_3"},
		{"MultiMedia21 Mixer", "QUAT_TDM_TX_0", "QUAT_TDM_TX_0"},
		{"MultiMedia21 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},
		{"MultiMedia21 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},
		{"MultiMedia21 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},
		{"MultiMedia21 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},
		{"MultiMedia21 Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},

		{"MultiMedia1 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},
		{"MultiMedia2 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},
		{"MultiMedia4 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},
		@@ -13685,6 +13853,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MM_UL18", NULL, "MultiMedia18 Mixer"},
		{"MM_UL19", NULL, "MultiMedia19 Mixer"},
		{"MM_UL20", NULL, "MultiMedia20 Mixer"},
		{"MM_UL21", NULL, "MultiMedia21 Mixer"},

		{"AUX_PCM_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
		{"AUX_PCM_RX Audio Mixer", "MultiMedia2", "MM_DL2"},
		@@ -13702,6 +13871,9 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"AUX_PCM_RX Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"AUX_PCM_RX Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"AUX_PCM_RX Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"AUX_PCM_RX Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"AUX_PCM_RX Audio Mixer", "MultiMedia6", "MM_UL6"},
		{"AUX_PCM_RX Audio Mixer", "MultiMedia21", "MM_UL21"},
		{"AUX_PCM_RX", NULL, "AUX_PCM_RX Audio Mixer"},

		{"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -13720,6 +13892,9 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia14", "MM_DL14"},
		{"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia15", "MM_DL15"},
		{"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia16", "MM_DL16"},
		{"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia21", "MM_DL21"},
		{"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia6", "MM_UL6"},
		{"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia21", "MM_UL21"},
		{"SEC_AUX_PCM_RX", NULL, "SEC_AUX_PCM_RX Audio Mixer"},

		{"TERT_AUX_PCM_RX Audio Mixer", "MultiMedia1", "MM_DL1"},