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

Commit 95808472 authored by Vikram Panduranga's avatar Vikram Panduranga
Browse files

ASoC: msm: qdsp6v2: Add capture support for MultiMedia10 FE 



Change compress PCM to linear PCM for Multimedia10 FE. Add
capture support and necessary routing needed by capture
path on this FE. This can be used to enable bidirectional
audio usecase such as VoIP.

Change-Id: Ia95e974e38346163873482cfe515523be85f35d2
Signed-off-by: default avatarVikram Panduranga <vpandura@codeaurora.org>
parent 1996ec83

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

+13 −1
Original line number Diff line number Diff line
@@ -2376,8 +2376,20 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.rate_min =	8000,

			.rate_max = 384000,

		},

		.capture = {

			.stream_name = "MultiMedia10 Capture",

			.aif_name = "MM_UL10",

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

			.channels_min = 1,

			.channels_max = 8,

			.rate_min = 8000,

			.rate_max = 48000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.compress_new = snd_soc_new_compress,

		.name = "MultiMedia10",

		.probe = fe_dai_probe,

	},

sound/soc/msm/msm8998.c

+4 −3
Original line number Diff line number Diff line
@@ -5036,12 +5036,13 @@ static struct snd_soc_dai_link msm_common_dai_links[] = { 
		.id = MSM_FRONTEND_DAI_MULTIMEDIA7,

	},

	{

		.name = MSM_DAILINK_NAME(Compress3),

		.stream_name = "Compress3",

		.name = MSM_DAILINK_NAME(MultiMedia10),

		.stream_name = "MultiMedia10",

		.cpu_dai_name = "MultiMedia10",

		.platform_name = "msm-compress-dsp",

		.platform_name = "msm-pcm-dsp.1",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

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

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

+96 −0
Original line number Diff line number Diff line
@@ -3645,6 +3645,11 @@ static const struct snd_kcontrol_new ext_ec_ref_mux_ul16 = 
		msm_route_ec_ref_rx_enum[0],

		msm_routing_ec_ref_rx_get, msm_routing_ec_ref_rx_put);









static const struct snd_kcontrol_new ext_ec_ref_mux_ul10 =









	SOC_DAPM_ENUM_EXT("AUDIO_REF_EC_UL10 MUX Mux",









		msm_route_ec_ref_rx_enum[0],









		msm_routing_ec_ref_rx_get, msm_routing_ec_ref_rx_put);

















static const struct snd_kcontrol_new ext_ec_ref_mux_ul17 =









	SOC_DAPM_ENUM_EXT("AUDIO_REF_EC_UL17 MUX Mux",









		msm_route_ec_ref_rx_enum[0],








@@ -7251,6 +7256,59 @@ static const struct snd_kcontrol_new mmul9_mixer_controls[] = {







	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new mmul10_mixer_controls[] = {









	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_INT_FM_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("INTERNAL_BT_SCO_TX", MSM_BACKEND_DAI_INT_BT_SCO_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("AFE_PCM_TX", MSM_BACKEND_DAI_AFE_PCM_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("VOC_REC_DL", MSM_BACKEND_DAI_INCALL_RECORD_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("VOC_REC_UL", MSM_BACKEND_DAI_INCALL_RECORD_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("SLIM_6_TX", MSM_BACKEND_DAI_SLIMBUS_6_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA10, 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_MULTIMEDIA10, 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_MULTIMEDIA10, 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_MULTIMEDIA10, 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_MULTIMEDIA10, 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_MULTIMEDIA10, 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_MULTIMEDIA10, 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_MULTIMEDIA10, 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_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_SINGLE_EXT("USB_AUDIO_TX", MSM_BACKEND_DAI_USB_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};









static const struct snd_kcontrol_new mmul17_mixer_controls[] = {









	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,









	MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,








@@ -11489,6 +11547,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {







	SND_SOC_DAPM_AIF_OUT("MM_UL6", "MultiMedia6 Capture", 0, 0, 0, 0),









	SND_SOC_DAPM_AIF_OUT("MM_UL8", "MultiMedia8 Capture", 0, 0, 0, 0),









	SND_SOC_DAPM_AIF_OUT("MM_UL9", "MultiMedia9 Capture", 0, 0, 0, 0),









	SND_SOC_DAPM_AIF_OUT("MM_UL10", "MultiMedia10 Capture", 0, 0, 0, 0),









	SND_SOC_DAPM_AIF_OUT("MM_UL16", "MultiMedia16 Capture", 0, 0, 0, 0),









	SND_SOC_DAPM_AIF_OUT("MM_UL17", "MultiMedia17 Capture", 0, 0, 0, 0),









	SND_SOC_DAPM_AIF_OUT("MM_UL18", "MultiMedia18 Capture", 0, 0, 0, 0),








@@ -12225,6 +12284,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {







	mmul8_mixer_controls, ARRAY_SIZE(mmul8_mixer_controls)),









	SND_SOC_DAPM_MIXER("MultiMedia9 Mixer", SND_SOC_NOPM, 0, 0,









	mmul9_mixer_controls, ARRAY_SIZE(mmul9_mixer_controls)),









	SND_SOC_DAPM_MIXER("MultiMedia10 Mixer", SND_SOC_NOPM, 0, 0,









	mmul10_mixer_controls, ARRAY_SIZE(mmul10_mixer_controls)),









	SND_SOC_DAPM_MIXER("MultiMedia16 Mixer", SND_SOC_NOPM, 0, 0,









	mmul16_mixer_controls, ARRAY_SIZE(mmul16_mixer_controls)),









	SND_SOC_DAPM_MIXER("MultiMedia17 Mixer", SND_SOC_NOPM, 0, 0,








@@ -12557,6 +12618,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {







		&ext_ec_ref_mux_ul8),









	SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL9 MUX", SND_SOC_NOPM, 0, 0,









		&ext_ec_ref_mux_ul9),









	SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL10 MUX", SND_SOC_NOPM, 0, 0,









		&ext_ec_ref_mux_ul10),









	SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL16 MUX", SND_SOC_NOPM, 0, 0,









		&ext_ec_ref_mux_ul16),









	SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL17 MUX", SND_SOC_NOPM, 0, 0,








@@ -12810,9 +12873,11 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MultiMedia8 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},









	{"MultiMedia3 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},









	{"MultiMedia5 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},









	{"MultiMedia10 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},









	{"MultiMedia16 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},









	{"MultiMedia5 Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},









	{"MultiMedia5 Mixer", "SLIM_8_TX", "SLIMBUS_8_TX"},









	{"MultiMedia10 Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},









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









	{"MI2S_RX Audio Mixer", "MultiMedia2", "MM_DL2"},









	{"MI2S_RX Audio Mixer", "MultiMedia3", "MM_DL3"},








@@ -13379,6 +13444,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MultiMedia2 Mixer", "MI2S_TX", "MI2S_TX"},









	{"MultiMedia3 Mixer", "MI2S_TX", "MI2S_TX"},









	{"MultiMedia5 Mixer", "MI2S_TX", "MI2S_TX"},









	{"MultiMedia10 Mixer", "MI2S_TX", "MI2S_TX"},









	{"MultiMedia16 Mixer", "MI2S_TX", "MI2S_TX"},









	{"MultiMedia1 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},









	{"MultiMedia2 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},








@@ -13395,17 +13461,21 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MultiMedia1 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},









	{"MultiMedia3 Mixer", "AUX_PCM_TX", "AUX_PCM_TX"},









	{"MultiMedia5 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},









	{"MultiMedia10 Mixer", "AUX_PCM_TX", "AUX_PCM_TX"},









	{"MultiMedia1 Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},









	{"MultiMedia3 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},









	{"MultiMedia5 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},









	{"MultiMedia10 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},









	{"MultiMedia16 Mixer", "AUX_PCM_TX", "AUX_PCM_TX"},









	{"MultiMedia16 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},









	{"MultiMedia1 Mixer", "TERT_AUXPCM_UL_TX", "TERT_AUX_PCM_TX"},









	{"MultiMedia3 Mixer", "TERT_AUX_PCM_TX", "TERT_AUX_PCM_TX"},









	{"MultiMedia5 Mixer", "TERT_AUX_PCM_TX", "TERT_AUX_PCM_TX"},









	{"MultiMedia10 Mixer", "TERT_AUX_PCM_TX", "TERT_AUX_PCM_TX"},









	{"MultiMedia1 Mixer", "QUAT_AUXPCM_UL_TX", "QUAT_AUX_PCM_TX"},









	{"MultiMedia3 Mixer", "QUAT_AUX_PCM_TX", "QUAT_AUX_PCM_TX"},









	{"MultiMedia5 Mixer", "QUAT_AUX_PCM_TX", "QUAT_AUX_PCM_TX"},









	{"MultiMedia10 Mixer", "QUAT_AUX_PCM_TX", "QUAT_AUX_PCM_TX"},









	{"MultiMedia16 Mixer", "QUAT_AUX_PCM_TX", "QUAT_AUX_PCM_TX"},









	{"MultiMedia2 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},









	{"MultiMedia2 Mixer", "SLIM_6_TX", "SLIMBUS_6_TX"},








@@ -13418,13 +13488,16 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MultiMedia6 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"MultiMedia3 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"MultiMedia5 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"MultiMedia10 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"MultiMedia6 Mixer", "INT2_MI2S_TX", "INT2_MI2S_TX"},









	{"MultiMedia3 Mixer", "INT2_MI2S_TX", "INT2_MI2S_TX"},









	{"MultiMedia5 Mixer", "INT2_MI2S_TX", "INT2_MI2S_TX"},









	{"MultiMedia10 Mixer", "INT2_MI2S_TX", "INT2_MI2S_TX"},









	{"MultiMedia16 Mixer", "INT2_MI2S_TX", "INT2_MI2S_TX"},









	{"MultiMedia6 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},









	{"MultiMedia3 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},









	{"MultiMedia5 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},









	{"MultiMedia10 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},









	{"MultiMedia16 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},









	{"MultiMedia6 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"MultiMedia6 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},








@@ -13559,6 +13632,14 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MultiMedia9 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},









	{"MultiMedia9 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},

















	{"MultiMedia10 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},









	{"MultiMedia10 Mixer", "TERT_TDM_TX_1", "TERT_TDM_TX_1"},









	{"MultiMedia10 Mixer", "TERT_TDM_TX_2", "TERT_TDM_TX_2"},









	{"MultiMedia10 Mixer", "TERT_TDM_TX_3", "TERT_TDM_TX_3"},









	{"MultiMedia10 Mixer", "QUAT_TDM_TX_0", "QUAT_TDM_TX_0"},









	{"MultiMedia10 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},









	{"MultiMedia10 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},









	{"MultiMedia10 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},









	{"MultiMedia20 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"MultiMedia20 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},









	{"MultiMedia20 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},








@@ -13586,6 +13667,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MultiMedia5 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},









	{"MultiMedia6 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},









	{"MultiMedia8 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},









	{"MultiMedia10 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},

















	{"MultiMedia16 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},









	{"MultiMedia16 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},








@@ -13682,6 +13764,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MultiMedia1 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},









	{"MultiMedia3 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},









	{"MultiMedia4 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},









	{"MultiMedia10 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},









	{"MultiMedia17 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},









	{"MultiMedia18 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},









	{"MultiMedia19 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},








@@ -13701,6 +13784,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MultiMedia1 Mixer", "AFE_PCM_TX", "PCM_TX"},









	{"MultiMedia3 Mixer", "AFE_PCM_TX", "PCM_TX"},









	{"MultiMedia4 Mixer", "AFE_PCM_TX", "PCM_TX"},









	{"MultiMedia10 Mixer", "AFE_PCM_TX", "PCM_TX"},









	{"MultiMedia17 Mixer", "AFE_PCM_TX", "PCM_TX"},









	{"MultiMedia18 Mixer", "AFE_PCM_TX", "PCM_TX"},









	{"MultiMedia19 Mixer", "AFE_PCM_TX", "PCM_TX"},








@@ -13716,6 +13800,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MM_UL6", NULL, "MultiMedia6 Mixer"},









	{"MM_UL8", NULL, "MultiMedia8 Mixer"},









	{"MM_UL9", NULL, "MultiMedia9 Mixer"},









	{"MM_UL10", NULL, "MultiMedia10 Mixer"},









	{"MM_UL16", NULL, "MultiMedia16 Mixer"},









	{"MM_UL17", NULL, "MultiMedia17 Mixer"},









	{"MM_UL18", NULL, "MultiMedia18 Mixer"},








@@ -14104,6 +14189,16 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"AUDIO_REF_EC_UL9 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"AUDIO_REF_EC_UL9 MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},

















	{"AUDIO_REF_EC_UL10 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"AUDIO_REF_EC_UL10 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},









	{"AUDIO_REF_EC_UL10 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"AUDIO_REF_EC_UL10 MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},









	{"AUDIO_REF_EC_UL10 MUX", "SLIM_1_TX", "SLIMBUS_1_TX"},









	{"AUDIO_REF_EC_UL10 MUX", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},









	{"AUDIO_REF_EC_UL10 MUX", "QUAT_TDM_RX_0", "QUAT_TDM_RX_0"},









	{"AUDIO_REF_EC_UL10 MUX", "QUAT_TDM_RX_1", "QUAT_TDM_RX_1"},









	{"AUDIO_REF_EC_UL10 MUX", "QUAT_TDM_RX_2", "QUAT_TDM_RX_2"},









	{"AUDIO_REF_EC_UL10 MUX", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},









	{"AUDIO_REF_EC_UL17 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"AUDIO_REF_EC_UL17 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},









	{"AUDIO_REF_EC_UL17 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},








@@ -14127,6 +14222,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MM_UL6", NULL, "AUDIO_REF_EC_UL6 MUX"},









	{"MM_UL8", NULL, "AUDIO_REF_EC_UL8 MUX"},









	{"MM_UL9", NULL, "AUDIO_REF_EC_UL9 MUX"},









	{"MM_UL10", NULL, "AUDIO_REF_EC_UL10 MUX"},









	{"MM_UL16", NULL, "AUDIO_REF_EC_UL16 MUX"},









	{"MM_UL17", NULL, "AUDIO_REF_EC_UL17 MUX"},









	{"MM_UL18", NULL, "AUDIO_REF_EC_UL18 MUX"},

























sound/soc/msm/sdm660-ext-dai-links.c



+4
−3






























Original line number
Diff line number
Diff line







@@ -990,13 +990,14 @@ static struct snd_soc_dai_link msm_ext_common_fe_dai[] = {







		.id = MSM_FRONTEND_DAI_MULTIMEDIA7,









	},









	{/* hw:x,16 */









		.name = MSM_DAILINK_NAME(Compress3),









		.stream_name = "Compress3",









		.name = MSM_DAILINK_NAME(MultiMedia10),









		.stream_name = "MultiMedia10",









		.cpu_dai_name	= "MultiMedia10",









		.platform_name  = "msm-compress-dsp",









		.platform_name  = "msm-pcm-dsp.1",









		.dynamic = 1,









		.dpcm_capture = 1,









		.dpcm_playback = 1,









		.dpcm_capture = 1,









		.trigger = {SND_SOC_DPCM_TRIGGER_POST,









			 SND_SOC_DPCM_TRIGGER_POST},









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
































sound/soc/msm/sdm660-internal.c



+4
−3






























Original line number
Diff line number
Diff line







@@ -1914,13 +1914,14 @@ static struct snd_soc_dai_link msm_int_dai[] = {







		.id = MSM_FRONTEND_DAI_MULTIMEDIA7,









	},









	{/* hw:x,16 */









		.name = MSM_DAILINK_NAME(Compress3),









		.stream_name = "Compress3",









		.name = MSM_DAILINK_NAME(MultiMedia10),









		.stream_name = "MultiMedia10",









		.cpu_dai_name	= "MultiMedia10",









		.platform_name  = "msm-compress-dsp",









		.platform_name  = "msm-pcm-dsp.1",









		.dynamic = 1,









		.dpcm_capture = 1,









		.dpcm_playback = 1,









		.dpcm_capture = 1,









		.trigger = {SND_SOC_DPCM_TRIGGER_POST,









			 SND_SOC_DPCM_TRIGGER_POST},









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