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

Commit 7e4812c6 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: clean up bootup errors"

parents 9bca3eb5 38de3862

asoc/msm-pcm-routing-v2.c

+3 −65
Original line number Diff line number Diff line
@@ -8957,6 +8957,9 @@ static const struct snd_kcontrol_new tx_voip_mixer_controls[] = { 
	SOC_SINGLE_EXT("USB_AUDIO_TX_Voip", MSM_BACKEND_DAI_USB_TX,

	MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_SINGLE_EXT("PRI_TDM_TX_3_Voip", MSM_BACKEND_DAI_PRI_TDM_TX_3,

	MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

};









static const struct snd_kcontrol_new tx_voice_stub_mixer_controls[] = {








@@ -15535,11 +15538,7 @@ 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"},

















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









	{"PRI_TDM_RX_0_Voice Mixer", "Voice2", "VOICE2_DL"},









	{"PRI_TDM_RX_0_Voice Mixer", "Voip", "VOIP_DL"},









	{"PRI_TDM_RX_0_Voice Mixer", "VoLTE", "VoLTE_DL"},









	{"PRI_TDM_RX_0_Voice Mixer", "VoWLAN", "VoWLAN_DL"},









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









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









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








@@ -15549,11 +15548,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"PRI_TDM_RX_0_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},









	{"PRI_TDM_RX_0", NULL, "PRI_TDM_RX_0_Voice Mixer"},

















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









	{"PRI_TDM_RX_1_Voice Mixer", "Voice2", "VOICE2_DL"},









	{"PRI_TDM_RX_1_Voice Mixer", "Voip", "VOIP_DL"},









	{"PRI_TDM_RX_1_Voice Mixer", "VoLTE", "VoLTE_DL"},









	{"PRI_TDM_RX_1_Voice Mixer", "VoWLAN", "VoWLAN_DL"},









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









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









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








@@ -15563,11 +15558,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"PRI_TDM_RX_1_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},









	{"PRI_TDM_RX_1", NULL, "PRI_TDM_RX_1_Voice Mixer"},

















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









	{"PRI_TDM_RX_2_Voice Mixer", "Voice2", "VOICE2_DL"},









	{"PRI_TDM_RX_2_Voice Mixer", "Voip", "VOIP_DL"},









	{"PRI_TDM_RX_2_Voice Mixer", "VoLTE", "VoLTE_DL"},









	{"PRI_TDM_RX_2_Voice Mixer", "VoWLAN", "VoWLAN_DL"},









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









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









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








@@ -15577,11 +15568,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"PRI_TDM_RX_2_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},









	{"PRI_TDM_RX_2", NULL, "PRI_TDM_RX_2_Voice Mixer"},

















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









	{"PRI_TDM_RX_3_Voice Mixer", "Voice2", "VOICE2_DL"},









	{"PRI_TDM_RX_3_Voice Mixer", "Voip", "VOIP_DL"},









	{"PRI_TDM_RX_3_Voice Mixer", "VoLTE", "VoLTE_DL"},









	{"PRI_TDM_RX_3_Voice Mixer", "VoWLAN", "VoWLAN_DL"},









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









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









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








@@ -15716,55 +15703,6 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"MM_UL28", NULL, "AUDIO_REF_EC_UL28 MUX"},









	{"MM_UL29", NULL, "AUDIO_REF_EC_UL29 MUX"},

















	{"Voice_Tx Mixer", "PRI_TX_Voice", "PRI_I2S_TX"},









	{"Voice_Tx Mixer", "PRI_MI2S_TX_Voice", "PRI_MI2S_TX"},









	{"Voice_Tx Mixer", "MI2S_TX_Voice", "MI2S_TX"},









	{"Voice_Tx Mixer", "TERT_MI2S_TX_Voice", "TERT_MI2S_TX"},









	{"Voice_Tx Mixer", "SLIM_0_TX_Voice", "SLIMBUS_0_TX"},









	{"Voice_Tx Mixer", "INTERNAL_BT_SCO_TX_Voice", "INT_BT_SCO_TX"},









	{"Voice_Tx Mixer", "AFE_PCM_TX_Voice", "PCM_TX"},









	{"Voice_Tx Mixer", "AUX_PCM_TX_Voice", "AUX_PCM_TX"},









	{"Voice_Tx Mixer", "SEC_AUX_PCM_TX_Voice", "SEC_AUX_PCM_TX"},









	{"Voice_Tx Mixer", "SEC_MI2S_TX_Voice", "SEC_MI2S_TX"},









	{"Voice_Tx Mixer", "PRI_TDM_TX_3_Voice", "PRI_TDM_TX_3"},









	{"CS-VOICE_UL1", NULL, "Voice_Tx Mixer"},

















	{"Voice2_Tx Mixer", "PRI_TX_Voice2", "PRI_I2S_TX"},









	{"Voice2_Tx Mixer", "PRI_MI2S_TX_Voice2", "PRI_MI2S_TX"},









	{"Voice2_Tx Mixer", "MI2S_TX_Voice2", "MI2S_TX"},









	{"Voice2_Tx Mixer", "TERT_MI2S_TX_Voice2", "TERT_MI2S_TX"},









	{"Voice2_Tx Mixer", "SLIM_0_TX_Voice2", "SLIMBUS_0_TX"},









	{"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_Tx Mixer", "PRI_TDM_TX_3_Voice2", "PRI_TDM_TX_3"},









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

















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









	{"VoLTE_Tx Mixer", "SLIM_0_TX_VoLTE", "SLIMBUS_0_TX"},









	{"VoLTE_Tx Mixer", "INTERNAL_BT_SCO_TX_VoLTE", "INT_BT_SCO_TX"},









	{"VoLTE_Tx Mixer", "AFE_PCM_TX_VoLTE", "PCM_TX"},









	{"VoLTE_Tx Mixer", "AUX_PCM_TX_VoLTE", "AUX_PCM_TX"},









	{"VoLTE_Tx Mixer", "SEC_AUX_PCM_TX_VoLTE", "SEC_AUX_PCM_TX"},









	{"VoLTE_Tx Mixer", "MI2S_TX_VoLTE", "MI2S_TX"},









	{"VoLTE_Tx Mixer", "PRI_MI2S_TX_VoLTE", "PRI_MI2S_TX"},









	{"VoLTE_Tx Mixer", "TERT_MI2S_TX_VoLTE", "TERT_MI2S_TX"},









	{"VoLTE_Tx Mixer", "PRI_TDM_TX_3_VoLTE", "PRI_TDM_TX_3"},









	{"VoLTE_UL", NULL, "VoLTE_Tx Mixer"},

















	{"VoWLAN_Tx Mixer", "PRI_TX_VoWLAN", "PRI_I2S_TX"},









	{"VoWLAN_Tx Mixer", "SLIM_0_TX_VoWLAN", "SLIMBUS_0_TX"},









	{"VoWLAN_Tx Mixer", "INTERNAL_BT_SCO_TX_VoWLAN", "INT_BT_SCO_TX"},









	{"VoWLAN_Tx Mixer", "AFE_PCM_TX_VoWLAN", "PCM_TX"},









	{"VoWLAN_Tx Mixer", "AUX_PCM_TX_VoWLAN", "AUX_PCM_TX"},









	{"VoWLAN_Tx Mixer", "SEC_AUX_PCM_TX_VoWLAN", "SEC_AUX_PCM_TX"},









	{"VoWLAN_Tx Mixer", "MI2S_TX_VoWLAN", "MI2S_TX"},









	{"VoWLAN_Tx Mixer", "PRI_MI2S_TX_VoWLAN", "PRI_MI2S_TX"},









	{"VoWLAN_Tx Mixer", "TERT_MI2S_TX_VoWLAN", "TERT_MI2S_TX"},









	{"VoWLAN_Tx Mixer", "PRI_TDM_TX_3_VoWLAN", "PRI_TDM_TX_3"},









	{"VoWLAN_UL", NULL, "VoWLAN_Tx Mixer"},

















	{"VoiceMMode1_Tx Mixer", "PRI_TX_MMode1", "PRI_I2S_TX"},









	{"VoiceMMode1_Tx Mixer", "PRI_MI2S_TX_MMode1", "PRI_MI2S_TX"},









	{"VoiceMMode1_Tx Mixer", "MI2S_TX_MMode1", "MI2S_TX"},