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

Commit 06edf9c7 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 voice2 on secondary aux pcm"

parents 485a2272 2cdc3038

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

+8 −0
Original line number Diff line number Diff line
@@ -2729,6 +2729,9 @@ static const struct snd_kcontrol_new sec_aux_pcm_rx_voice_mixer_controls[] = { 
	SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_SEC_AUXPCM_RX,

	MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("Voice2", MSM_BACKEND_DAI_SEC_AUXPCM_RX,

	MSM_FRONTEND_DAI_VOICE2, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("Voip", MSM_BACKEND_DAI_SEC_AUXPCM_RX,

	MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),
@@ -2867,6 +2870,9 @@ static const struct snd_kcontrol_new tx_voice2_mixer_controls[] = { 
	SOC_SINGLE_EXT("AUX_PCM_TX_Voice2", MSM_BACKEND_DAI_AUXPCM_TX,

	MSM_FRONTEND_DAI_VOICE2, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("SEC_AUX_PCM_TX_Voice2", MSM_BACKEND_DAI_SEC_AUXPCM_TX,

	MSM_FRONTEND_DAI_VOICE2, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX_Voice2", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_VOICE2, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),
@@ -4451,6 +4457,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"AUX_PCM_RX", NULL, "AUX_PCM_RX_Voice Mixer"},



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

	{"SEC_AUX_PCM_RX_Voice Mixer", "Voice2", "VOICE2_DL"},

	{"SEC_AUX_PCM_RX_Voice Mixer", "VoLTE", "VoLTE_DL"},

	{"SEC_AUX_PCM_RX_Voice Mixer", "VoWLAN", "VoWLAN_DL"},

	{"SEC_AUX_PCM_RX_Voice Mixer", "Voip", "VOIP_DL"},
@@ -4571,6 +4578,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"Voice2_Tx Mixer", "INTERNAL_BT_SCO_TX_Voice2", "INT_BT_SCO_TX"},

	{"Voice2_Tx Mixer", "AFE_PCM_TX_Voice2", "PCM_TX"},

	{"Voice2_Tx Mixer", "AUX_PCM_TX_Voice2", "AUX_PCM_TX"},

	{"Voice2_Tx Mixer", "SEC_AUX_PCM_TX_Voice2", "SEC_AUX_PCM_TX"},

	{"VOICE2_UL", NULL, "Voice2_Tx Mixer"},



	{"VoLTE_Tx Mixer", "PRI_TX_VoLTE", "PRI_I2S_TX"},