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

Commit 80e9fa04 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: add routing for VoiceMMode1 FE and TDM BE"

parents 72f9e580 90a447e1

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

+17 −0
Original line number Diff line number Diff line
@@ -4608,6 +4608,12 @@ static const struct snd_kcontrol_new hdmi_rx_voice_mixer_controls[] = { 
	msm_routing_put_voice_mixer),

};



static const struct snd_kcontrol_new quat_tdm_rx_2_voice_mixer_controls[] = {

	SOC_SINGLE_EXT("VoiceMMode1", MSM_BACKEND_DAI_QUAT_TDM_RX_2,

	MSM_FRONTEND_DAI_VOICEMMODE1, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

};



static const struct snd_kcontrol_new stub_rx_mixer_controls[] = {

	SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_EXTPROC_RX,

	MSM_FRONTEND_DAI_VOICE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
@@ -4795,6 +4801,9 @@ static const struct snd_kcontrol_new tx_voicemmode1_mixer_controls[] = { 
	SOC_SINGLE_EXT("TERT_MI2S_TX_MMode1",

	MSM_BACKEND_DAI_TERTIARY_MI2S_TX, MSM_FRONTEND_DAI_VOICEMMODE1,

	1, 0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("QUAT_TDM_TX_0_MMode1",

	MSM_BACKEND_DAI_QUAT_TDM_TX_0, MSM_FRONTEND_DAI_VOICEMMODE1,

	1, 0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),

};



static const struct snd_kcontrol_new tx_voicemmode2_mixer_controls[] = {
@@ -7403,6 +7412,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
				SND_SOC_NOPM, 0, 0,

				quin_mi2s_rx_voice_mixer_controls,

				ARRAY_SIZE(quin_mi2s_rx_voice_mixer_controls)),

	SND_SOC_DAPM_MIXER("QUAT_TDM_RX_2_Voice Mixer",

				SND_SOC_NOPM, 0, 0,

				quat_tdm_rx_2_voice_mixer_controls,

				ARRAY_SIZE(quat_tdm_rx_2_voice_mixer_controls)),

	SND_SOC_DAPM_MIXER("Voice_Tx Mixer",

				SND_SOC_NOPM, 0, 0, tx_voice_mixer_controls,

				ARRAY_SIZE(tx_voice_mixer_controls)),
@@ -8396,6 +8409,9 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"QUIN_MI2S_RX_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},

	{"QUIN_MI2S_RX", NULL, "QUIN_MI2S_RX_Voice Mixer"},



	{"QUAT_TDM_RX_2_Voice Mixer", "VoiceMMode1", "VOICEMMODE1_DL"},

	{"QUAT_TDM_RX_2", NULL, "QUAT_TDM_RX_2_Voice Mixer"},



	{"VOC_EXT_EC MUX", "PRI_MI2S_TX" , "PRI_MI2S_TX"},

	{"VOC_EXT_EC MUX", "SEC_MI2S_TX" , "SEC_MI2S_TX"},

	{"VOC_EXT_EC MUX", "TERT_MI2S_TX" , "TERT_MI2S_TX"},
@@ -8512,6 +8528,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"VoiceMMode1_Tx Mixer", "AFE_PCM_TX_MMode1", "PCM_TX"},

	{"VoiceMMode1_Tx Mixer", "AUX_PCM_TX_MMode1", "AUX_PCM_TX"},

	{"VoiceMMode1_Tx Mixer", "SEC_AUX_PCM_TX_MMode1", "SEC_AUX_PCM_TX"},

	{"VoiceMMode1_Tx Mixer", "QUAT_TDM_TX_0_MMode1", "QUAT_TDM_TX_0"},

	{"VOICEMMODE1_UL", NULL, "VoiceMMode1_Tx Mixer"},



	{"VoiceMMode2_Tx Mixer", "PRI_TX_MMode2", "PRI_I2S_TX"},