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

Commit 4f7295be 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: route voice2/VoLTE calls to MI2S"

parents 662cdfa7 7246db7f

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

+28 −0
Original line number Diff line number Diff line
@@ -1993,6 +1993,9 @@ static const struct snd_kcontrol_new pri_mi2s_rx_voice_mixer_controls[] = { 
	SOC_SINGLE_EXT("VoLTE", MSM_BACKEND_DAI_PRI_MI2S_RX,

	MSM_FRONTEND_DAI_VOLTE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("VoLTE Stub", MSM_BACKEND_DAI_PRI_MI2S_RX,

	MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("VoWLAN", MSM_BACKEND_DAI_PRI_MI2S_RX,

	MSM_FRONTEND_DAI_VOWLAN, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),
@@ -2017,9 +2020,15 @@ static const struct snd_kcontrol_new quat_mi2s_rx_voice_mixer_controls[] = { 
	SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOICE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("Voice2 Stub", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("VoLTE", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOLTE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("VoLTE Stub", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("VoWLAN", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,

	MSM_FRONTEND_DAI_VOWLAN, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),
@@ -2384,6 +2393,12 @@ static const struct snd_kcontrol_new tx_voice2_stub_mixer_controls[] = { 
	SOC_SINGLE_EXT("AFE_PCM_TX", MSM_BACKEND_DAI_AFE_PCM_TX,

	MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,

	MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),



};
@@ -2409,6 +2424,12 @@ static const struct snd_kcontrol_new tx_volte_stub_mixer_controls[] = { 
	SOC_SINGLE_EXT("AFE_PCM_TX", MSM_BACKEND_DAI_AFE_PCM_TX,

	MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

	SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,

	MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,

	msm_routing_put_voice_stub_mixer),

};



static const struct snd_kcontrol_new tx_qchat_mixer_controls[] = {
@@ -3629,6 +3650,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"PRI_MI2S_RX_Voice Mixer", "Voip", "VOIP_DL"},

	{"PRI_MI2S_RX_Voice Mixer", "VoLTE", "VoLTE_DL"},

	{"PRI_MI2S_RX_Voice Mixer", "VoWLAN", "VoWLAN_DL"},

	{"PRI_MI2S_RX_Voice Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},

	{"PRI_MI2S_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},

	{"PRI_MI2S_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},

	{"PRI_MI2S_RX_Voice Mixer", "QCHAT", "QCHAT_DL"},
@@ -3639,7 +3661,9 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"QUAT_MI2S_RX_Voice Mixer", "Voip", "VOIP_DL"},

	{"QUAT_MI2S_RX_Voice Mixer", "VoLTE", "VoLTE_DL"},

	{"QUAT_MI2S_RX_Voice Mixer", "VoWLAN", "VoWLAN_DL"},

	{"QUAT_MI2S_RX_Voice Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},

	{"QUAT_MI2S_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},

	{"QUAT_MI2S_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},

	{"QUAT_MI2S_RX_Voice Mixer", "QCHAT", "QCHAT_DL"},

	{"QUAT_MI2S_RX", NULL, "QUAT_MI2S_RX_Voice Mixer"},
@@ -3848,6 +3872,8 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"VoLTE Stub Tx Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"VoLTE Stub Tx Mixer", "SLIM_3_TX", "SLIMBUS_3_TX"},

	{"VoLTE Stub Tx Mixer", "AFE_PCM_TX", "PCM_TX"},

	{"VoLTE Stub Tx Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"VoLTE Stub Tx Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},

	{"VOLTE_STUB_UL", NULL, "VoLTE Stub Tx Mixer"},



	{"Voice2 Stub Tx Mixer", "STUB_TX_HL", "STUB_TX"},
@@ -3857,6 +3883,8 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"Voice2 Stub Tx Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"Voice2 Stub Tx Mixer", "SLIM_3_TX", "SLIMBUS_3_TX"},

	{"Voice2 Stub Tx Mixer", "AFE_PCM_TX", "PCM_TX"},

	{"Voice2 Stub Tx Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"Voice2 Stub Tx Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},

	{"VOICE2_STUB_UL", NULL, "Voice2 Stub Tx Mixer"},



	{"STUB_RX Mixer", "Voice Stub", "VOICE_STUB_DL"},