Merge "ASoC: msm: Add FE dai for MultiMedia21 for ASM Loopback" (0e87891f) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/apq8096-auto.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -3044,21 +3044,22 @@ static struct snd_soc_dai_link apq8096_common_dai_links[] = {
		.codec_name = "snd-soc-dummy",
		},
		{
		.name = "SLIMBUS_4 Hostless",
		.stream_name = "SLIMBUS_4 Hostless",
		.cpu_dai_name = "SLIMBUS4_HOSTLESS",
		.platform_name = "msm-pcm-hostless",
		.name = "MSM8996 HFP RX",
		.stream_name = "MultiMedia21",
		.cpu_dai_name = "MultiMedia21",
		.platform_name = "msm-pcm-loopback",
		.dynamic = 1,
		.dpcm_playback = 1,
		.dpcm_capture = 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 dailink has playback support */
		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
		/* 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_MULTIMEDIA21,
		},
		{
		.name = "VoLTE",

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

+33 −0

Original line number	Diff line number	Diff line
		@@ -2565,6 +2565,39 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
		.name = "MultiMedia20",
		.probe = fe_dai_probe,
		},
		{
		.playback = {
		.stream_name = "MultiMedia21 Playback",
		.aif_name = "MM_DL21",
		.rates = (SNDRV_PCM_RATE_8000_384000 \|
		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 = 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,
		},
		};

		static int msm_fe_dai_dev_probe(struct platform_device *pdev)

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

+162 −0

Original line number	Diff line number	Diff line
		@@ -511,6 +511,9 @@ 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} } },
		/* CS_VOICE */
		@@ -4376,6 +4379,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[] = {
		@@ -4436,6 +4442,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 pri_tdm_rx_0_mixer_controls[] = {
		@@ -4487,6 +4496,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[] = {
		@@ -4538,6 +4550,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[] = {
		@@ -4589,6 +4604,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[] = {
		@@ -4640,6 +4658,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 sec_tdm_rx_0_mixer_controls[] = {
		@@ -4691,6 +4712,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[] = {
		@@ -4742,6 +4766,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[] = {
		@@ -4793,6 +4820,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[] = {
		@@ -4844,6 +4874,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 tert_tdm_rx_0_mixer_controls[] = {
		@@ -4895,6 +4928,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_rx_1_mixer_controls[] = {
		@@ -4946,6 +4982,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[] = {
		@@ -4997,6 +5036,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[] = {
		@@ -5048,6 +5090,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[] = {
		@@ -5099,6 +5144,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[] = {
		@@ -5153,6 +5201,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_rx_1_mixer_controls[] = {
		@@ -5207,6 +5258,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[] = {
		@@ -5261,6 +5315,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[] = {
		@@ -5315,6 +5372,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[] = {
		@@ -6151,6 +6211,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,
		@@ -9552,6 +9669,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		SND_SOC_DAPM_AIF_IN("MM_DL15", "MultiMedia15 Playback", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("MM_DL16", "MultiMedia16 Playback", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("MM_DL20", "MultiMedia20 Playback", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("MM_DL21", "MultiMedia21 Playback", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("VOIP_DL", "VoIP Playback", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("MM_UL1", "MultiMedia1 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("MM_UL2", "MultiMedia2 Capture", 0, 0, 0, 0),
		@@ -9565,6 +9683,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),
		@@ -10225,6 +10344,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,
		@@ -10793,6 +10914,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"},
		@@ -10811,6 +10933,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"},
		@@ -10829,6 +10952,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"},
		@@ -10847,6 +10971,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"},

		{"SEC_TDM_RX_0 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -10865,6 +10990,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"},
		@@ -10883,6 +11009,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"},
		@@ -10901,6 +11028,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"},
		@@ -10919,6 +11047,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"},

		{"TERT_TDM_RX_0 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -10937,6 +11066,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_RX_1 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -10955,6 +11085,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"},
		@@ -10973,6 +11104,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"},
		@@ -10991,6 +11123,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"},
		@@ -11009,6 +11142,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"},
		@@ -11028,6 +11162,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"},

		{"QUAT_TDM_RX_1 Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -11047,6 +11182,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"},
		@@ -11066,6 +11202,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"},
		@@ -11085,6 +11222,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"},

		{"TERT_MI2S_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
		@@ -11285,6 +11423,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"},

		{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
		{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia2", "MM_DL2"},
		{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia3", "MM_DL3"},
		@@ -11397,6 +11554,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"},
		@@ -11414,7 +11572,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"},
		@@ -11433,7 +11593,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"},

		{"MI2S_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"},

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@ enum {
		MSM_FRONTEND_DAI_MULTIMEDIA18,
		MSM_FRONTEND_DAI_MULTIMEDIA19,
		MSM_FRONTEND_DAI_MULTIMEDIA20,
		MSM_FRONTEND_DAI_MULTIMEDIA21,
		MSM_FRONTEND_DAI_CS_VOICE,
		MSM_FRONTEND_DAI_VOIP,
		MSM_FRONTEND_DAI_AFE_RX,
		@@ -183,8 +184,8 @@ enum {
		MSM_FRONTEND_DAI_MAX,
		};

		#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA20 + 1)
		#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA20
		#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA21 + 1)
		#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA21

		enum {
		MSM_BACKEND_DAI_PRI_I2S_RX = 0,