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

Commit a1cb6b5d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: routing: add missed widget connection"

parents e97057ae d2e050bf

asoc/msm-pcm-routing-v2.c

+30 −0
Original line number Diff line number Diff line
@@ -5942,6 +5942,12 @@ static const struct snd_kcontrol_new ext_ec_ref_mux_ul29 = 
		msm_route_ec_ref_rx_enum[0],

		msm_routing_ec_ref_rx_get, msm_routing_ec_ref_rx_put);









static const struct snd_kcontrol_new ext_ec_ref_mux_ul30 =









	SOC_DAPM_ENUM_EXT("AUDIO_REF_EC_UL30 MUX Mux",









		msm_route_ec_ref_rx_enum[0],









		msm_routing_ec_ref_rx_get, msm_routing_ec_ref_rx_put);

























static int msm_routing_ext_ec_get(struct snd_kcontrol *kcontrol,









				  struct snd_ctl_elem_value *ucontrol)









{








@@ -8988,6 +8994,10 @@ static const struct snd_kcontrol_new slimbus_7_rx_mixer_controls[] = {







	MSM_BACKEND_DAI_SLIMBUS_7_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_DOUBLE_EXT("MultiMedia31", SND_SOC_NOPM,









	MSM_BACKEND_DAI_SLIMBUS_7_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new slimbus_9_rx_mixer_controls[] = {








@@ -12474,6 +12484,19 @@ static const struct snd_kcontrol_new quin_tdm_rx_1_mixer_controls[] = {







	MSM_BACKEND_DAI_QUIN_TDM_RX_1,









	MSM_FRONTEND_DAI_MULTIMEDIA22, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_DOUBLE_EXT("MultiMedia23", SND_SOC_NOPM,









	MSM_BACKEND_DAI_QUIN_TDM_RX_1,









	MSM_FRONTEND_DAI_MULTIMEDIA23, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_DOUBLE_EXT("MultiMedia24", SND_SOC_NOPM,









	MSM_BACKEND_DAI_QUIN_TDM_RX_1,









	MSM_FRONTEND_DAI_MULTIMEDIA24, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_DOUBLE_EXT("MultiMedia25", SND_SOC_NOPM,









	MSM_BACKEND_DAI_QUIN_TDM_RX_1,









	MSM_FRONTEND_DAI_MULTIMEDIA25, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),

















};

















static const struct snd_kcontrol_new quin_tdm_tx_2_mixer_controls[] = {








@@ -26429,6 +26452,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {







		&ext_ec_ref_mux_ul28),









	SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL29 MUX", SND_SOC_NOPM, 0, 0,









		&ext_ec_ref_mux_ul29),









	SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL30 MUX", SND_SOC_NOPM, 0, 0,









		&ext_ec_ref_mux_ul30),









};

















static const struct snd_soc_dapm_route intercon[] = {








@@ -29424,6 +29449,11 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"AUDIO_REF_EC_UL29 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"AUDIO_REF_EC_UL29 MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},

















	{"AUDIO_REF_EC_UL30 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"AUDIO_REF_EC_UL30 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},









	{"AUDIO_REF_EC_UL30 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"AUDIO_REF_EC_UL30 MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},

















	{"LSM1_UL_HL", NULL, "AUDIO_REF_EC_UL1 MUX"},









	{"LSM2_UL_HL", NULL, "AUDIO_REF_EC_UL1 MUX"},









	{"LSM3_UL_HL", NULL, "AUDIO_REF_EC_UL1 MUX"},