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

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

Merge "asoc: Add routing controls for SLIMBUS_1_TX"

parents 3cf9436f 8f2d512d

asoc/msm-pcm-routing-v2.c

+13 −0
Original line number Diff line number Diff line
@@ -13051,6 +13051,9 @@ static const struct snd_kcontrol_new tx_voicemmode1_mixer_controls[] = { 
	SOC_DOUBLE_EXT("SLIM_0_TX_MMode1", SND_SOC_NOPM,

	MSM_BACKEND_DAI_SLIMBUS_0_TX, MSM_FRONTEND_DAI_VOICEMMODE1, 1,

	0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),

	SOC_DOUBLE_EXT("SLIM_1_TX_MMode1", SND_SOC_NOPM,

	MSM_BACKEND_DAI_SLIMBUS_1_TX, MSM_FRONTEND_DAI_VOICEMMODE1, 1,

	0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),

	SOC_DOUBLE_EXT("INT_BT_SCO_TX_MMode1", SND_SOC_NOPM,

	MSM_BACKEND_DAI_INT_BT_SCO_TX, MSM_FRONTEND_DAI_VOICEMMODE1, 1,

	0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),
@@ -13132,6 +13135,9 @@ static const struct snd_kcontrol_new tx_voicemmode2_mixer_controls[] = { 
	SOC_DOUBLE_EXT("SLIM_0_TX_MMode2", SND_SOC_NOPM,

	MSM_BACKEND_DAI_SLIMBUS_0_TX, MSM_FRONTEND_DAI_VOICEMMODE2, 1,

	0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),

	SOC_DOUBLE_EXT("SLIM_1_TX_MMode2", SND_SOC_NOPM,

	MSM_BACKEND_DAI_SLIMBUS_1_TX, MSM_FRONTEND_DAI_VOICEMMODE2, 1,

	0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),

	SOC_DOUBLE_EXT("INT_BT_SCO_TX_MMode2", SND_SOC_NOPM,

	MSM_BACKEND_DAI_INT_BT_SCO_TX, MSM_FRONTEND_DAI_VOICEMMODE2, 1,

	0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),
@@ -13210,6 +13216,10 @@ static const struct snd_kcontrol_new tx_voip_mixer_controls[] = { 
	MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_DOUBLE_EXT("SLIM_1_TX_Voip", SND_SOC_NOPM,

	MSM_BACKEND_DAI_SLIMBUS_1_TX,

	MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,

	msm_routing_put_voice_mixer),

	SOC_DOUBLE_EXT("INTERNAL_BT_SCO_TX_Voip", SND_SOC_NOPM,

	MSM_BACKEND_DAI_INT_BT_SCO_TX,

	MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,
@@ -21799,6 +21809,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"VoiceMMode1_Tx Mixer", "TERT_MI2S_TX_MMode1", "TERT_MI2S_TX"},

	{"VoiceMMode1_Tx Mixer", "INT3_MI2S_TX_MMode1", "INT3_MI2S_TX"},

	{"VoiceMMode1_Tx Mixer", "SLIM_0_TX_MMode1", "SLIMBUS_0_TX"},

	{"VoiceMMode1_Tx Mixer", "SLIM_1_TX_MMode1", "SLIMBUS_1_TX"},

	{"VoiceMMode1_Tx Mixer", "SLIM_7_TX_MMode1", "SLIMBUS_7_TX"},

	{"VoiceMMode1_Tx Mixer", "SLIM_8_TX_MMode1", "SLIMBUS_8_TX"},

	{"VoiceMMode1_Tx Mixer", "USB_AUDIO_TX_MMode1", "USB_AUDIO_TX"},
@@ -21824,6 +21835,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"VoiceMMode2_Tx Mixer", "TERT_MI2S_TX_MMode2", "TERT_MI2S_TX"},

	{"VoiceMMode2_Tx Mixer", "INT3_MI2S_TX_MMode2", "INT3_MI2S_TX"},

	{"VoiceMMode2_Tx Mixer", "SLIM_0_TX_MMode2", "SLIMBUS_0_TX"},

	{"VoiceMMode2_Tx Mixer", "SLIM_1_TX_MMode2", "SLIMBUS_1_TX"},

	{"VoiceMMode2_Tx Mixer", "SLIM_7_TX_MMode2", "SLIMBUS_7_TX"},

	{"VoiceMMode2_Tx Mixer", "SLIM_8_TX_MMode2", "SLIMBUS_8_TX"},

	{"VoiceMMode2_Tx Mixer", "USB_AUDIO_TX_MMode2", "USB_AUDIO_TX"},
@@ -21847,6 +21859,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"Voip_Tx Mixer", "TERT_MI2S_TX_Voip", "TERT_MI2S_TX"},

	{"Voip_Tx Mixer", "INT3_MI2S_TX_Voip", "INT3_MI2S_TX"},

	{"Voip_Tx Mixer", "SLIM_0_TX_Voip", "SLIMBUS_0_TX"},

	{"Voip_Tx Mixer", "SLIM_1_TX_Voip", "SLIMBUS_1_TX"},

	{"Voip_Tx Mixer", "SLIM_7_TX_Voip", "SLIMBUS_7_TX"},

	{"Voip_Tx Mixer", "SLIM_8_TX_Voip", "SLIMBUS_8_TX"},

	{"Voip_Tx Mixer", "USB_AUDIO_TX_Voip", "USB_AUDIO_TX"},