Merge "ASoC: msm: qdsp6v2: Add routing commands to support voice2 call" (54d32a7b) · Commits · e / devices / android_kernel_sony_msm8994

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

+73 −0

Original line number	Diff line number	Diff line
		@@ -1882,6 +1882,9 @@ static const struct snd_kcontrol_new slimbus_rx_voice_mixer_controls[] = {
		SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_SLIMBUS_0_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_SLIMBUS_0_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_SLIMBUS_0_RX ,
		MSM_FRONTEND_DAI_VOLTE, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		@@ -1957,6 +1960,9 @@ static const struct snd_kcontrol_new pri_mi2s_rx_voice_mixer_controls[] = {
		SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_PRI_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_PRI_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_PRI_MI2S_RX,
		MSM_FRONTEND_DAI_VOLTE, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		@@ -2005,6 +2011,9 @@ static const struct snd_kcontrol_new afe_pcm_rx_voice_mixer_controls[] = {
		SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_AFE_PCM_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_AFE_PCM_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_AFE_PCM_RX,
		MSM_FRONTEND_DAI_VOLTE, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		@@ -2032,6 +2041,9 @@ static const struct snd_kcontrol_new aux_pcm_rx_voice_mixer_controls[] = {
		SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_AUXPCM_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_AUXPCM_RX,
		MSM_FRONTEND_DAI_VOICE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("VoLTE", MSM_BACKEND_DAI_AUXPCM_RX,
		MSM_FRONTEND_DAI_VOLTE, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		@@ -2083,6 +2095,9 @@ static const struct snd_kcontrol_new hdmi_rx_voice_mixer_controls[] = {
		SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_HDMI_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_HDMI_RX,
		MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("VoLTE Stub", MSM_BACKEND_DAI_HDMI_RX,
		MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		@@ -2098,6 +2113,9 @@ 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,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("Voice2 Stub", MSM_BACKEND_DAI_EXTPROC_RX,
		MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("VoLTE Stub", MSM_BACKEND_DAI_EXTPROC_RX,
		MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		@@ -2107,6 +2125,9 @@ static const struct snd_kcontrol_new slimbus_1_rx_mixer_controls[] = {
		SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_SLIMBUS_1_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_SLIMBUS_1_RX,
		MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("VoLTE Stub", MSM_BACKEND_DAI_SLIMBUS_1_RX,
		MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		@@ -2116,6 +2137,9 @@ static const struct snd_kcontrol_new slimbus_3_rx_mixer_controls[] = {
		SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_SLIMBUS_3_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_SLIMBUS_3_RX,
		MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("VoLTE Stub", MSM_BACKEND_DAI_SLIMBUS_3_RX,
		MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		@@ -2266,6 +2290,31 @@ static const struct snd_kcontrol_new tx_voice_stub_mixer_controls[] = {

		};

		static const struct snd_kcontrol_new tx_voice2_stub_mixer_controls[] = {
		SOC_SINGLE_EXT("STUB_TX_HL", MSM_BACKEND_DAI_EXTPROC_TX,
		MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("SLIM_1_TX", MSM_BACKEND_DAI_SLIMBUS_1_TX,
		MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("STUB_1_TX_HL", MSM_BACKEND_DAI_EXTPROC_EC_TX,
		MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_TX,
		MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,
		MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("SLIM_3_TX", MSM_BACKEND_DAI_SLIMBUS_3_TX,
		MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		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),

		};

		static const struct snd_kcontrol_new tx_volte_stub_mixer_controls[] = {
		SOC_SINGLE_EXT("STUB_TX_HL", MSM_BACKEND_DAI_EXTPROC_TX,
		MSM_FRONTEND_DAI_VOLTE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		@@ -2918,6 +2967,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("VOICE_STUB_DL", "VOICE_STUB Playback", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("VOICE_STUB_UL", "VOICE_STUB Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("VOICE2_STUB_DL", "VOICE2_STUB Playback",
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("VOICE2_STUB_UL", "VOICE2_STUB Capture",
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("VOLTE_STUB_DL", "VOLTE_STUB Playback", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("VOLTE_STUB_UL", "VOLTE_STUB Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("STUB_RX", "Stub Playback", 0, 0, 0, 0),
		@@ -3082,6 +3135,9 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		afe_pcm_rx_mixer_controls, ARRAY_SIZE(afe_pcm_rx_mixer_controls)),
		SND_SOC_DAPM_MIXER("Voice Stub Tx Mixer", SND_SOC_NOPM, 0, 0,
		tx_voice_stub_mixer_controls, ARRAY_SIZE(tx_voice_stub_mixer_controls)),
		SND_SOC_DAPM_MIXER("Voice2 Stub Tx Mixer", SND_SOC_NOPM, 0, 0,
		tx_voice2_stub_mixer_controls,
		ARRAY_SIZE(tx_voice2_stub_mixer_controls)),
		SND_SOC_DAPM_MIXER("VoLTE Stub Tx Mixer", SND_SOC_NOPM, 0, 0,
		tx_volte_stub_mixer_controls, ARRAY_SIZE(tx_volte_stub_mixer_controls)),
		SND_SOC_DAPM_MIXER("STUB_RX Mixer", SND_SOC_NOPM, 0, 0,
		@@ -3403,6 +3459,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SLIM_0_RX_Voice Mixer", "Voip", "VOIP_DL"},
		{"SLIM_0_RX_Voice Mixer", "DTMF", "DTMF_DL_HL"},
		{"SLIM_0_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},
		{"SLIM_0_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"SLIM_0_RX_Voice Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},
		{"SLIM_0_RX_Voice Mixer", "QCHAT", "QCHAT_DL"},
		{"SLIMBUS_0_RX", NULL, "SLIM_0_RX_Voice Mixer"},
		@@ -3429,6 +3486,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"AUX_PCM_RX_Voice Mixer", "Voip", "VOIP_DL"},
		{"AUX_PCM_RX_Voice Mixer", "DTMF", "DTMF_DL_HL"},
		{"AUX_PCM_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},
		{"AUX_PCM_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"AUX_PCM_RX_Voice Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},
		{"AUX_PCM_RX_Voice Mixer", "QCHAT", "QCHAT_DL"},
		{"AUX_PCM_RX", NULL, "AUX_PCM_RX_Voice Mixer"},
		@@ -3463,6 +3521,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", "Voice Stub", "VOICE_STUB_DL"},
		{"PRI_MI2S_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"PRI_MI2S_RX_Voice Mixer", "QCHAT", "QCHAT_DL"},
		{"PRI_MI2S_RX", NULL, "PRI_MI2S_RX_Voice Mixer"},

		@@ -3666,16 +3725,30 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"VoLTE Stub Tx Mixer", "AFE_PCM_TX", "PCM_TX"},
		{"VOLTE_STUB_UL", NULL, "VoLTE Stub Tx Mixer"},

		{"Voice2 Stub Tx Mixer", "STUB_TX_HL", "STUB_TX"},
		{"Voice2 Stub Tx Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"Voice2 Stub Tx Mixer", "STUB_1_TX_HL", "STUB_1_TX"},
		{"Voice2 Stub Tx Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},
		{"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_UL", NULL, "Voice2 Stub Tx Mixer"},

		{"STUB_RX Mixer", "Voice Stub", "VOICE_STUB_DL"},
		{"STUB_RX Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"STUB_RX Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},
		{"STUB_RX", NULL, "STUB_RX Mixer"},
		{"SLIMBUS_1_RX Mixer", "Voice Stub", "VOICE_STUB_DL"},
		{"SLIMBUS_1_RX Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"SLIMBUS_1_RX Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},
		{"SLIMBUS_1_RX", NULL, "SLIMBUS_1_RX Mixer"},
		{"INTERNAL_BT_SCO_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},
		{"INTERNAL_BT_SCO_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"AFE_PCM_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},
		{"AFE_PCM_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"AFE_PCM_RX_Voice Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},
		{"SLIMBUS_3_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},
		{"SLIMBUS_3_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"SLIMBUS_3_RX_Voice Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},
		{"SLIMBUS_3_RX", NULL, "SLIMBUS_3_RX_Voice Mixer"},

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ enum {
		MSM_FRONTEND_DAI_LSM6,
		MSM_FRONTEND_DAI_LSM7,
		MSM_FRONTEND_DAI_LSM8,
		MSM_FRONTEND_DAI_VOICE2_STUB,
		MSM_FRONTEND_DAI_MAX,
		};