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

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

Merge "asoc: reduce AUXPCM widget connection when it's disabled"

parents 2fea3356 210bdddd

asoc/msm-pcm-routing-v2.c

+12 −0
Original line number Diff line number Diff line
@@ -21971,6 +21971,7 @@ static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = { 
	MSM_BACKEND_DAI_SLIMBUS_0_RX,

	MSM_BACKEND_DAI_SLIMBUS_8_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

#ifndef CONFIG_AUXPCM_DISABLE

	SOC_DOUBLE_EXT("AUX_PCM_UL_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_SLIMBUS_0_RX,

	MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,
@@ -21995,6 +21996,7 @@ static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = { 
	MSM_BACKEND_DAI_SLIMBUS_0_RX,

	MSM_BACKEND_DAI_SEN_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

#endif

	SOC_DOUBLE_EXT("MI2S_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_SLIMBUS_0_RX,

	MSM_BACKEND_DAI_MI2S_TX, 1, 0, msm_routing_get_port_mixer,
@@ -27298,12 +27300,14 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"SLIMBUS_0_RX Port Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},

	{"SLIMBUS_0_RX Port Mixer", "SLIM_8_TX", "SLIMBUS_8_TX"},

	{"SLIMBUS_0_RX Port Mixer", "SLIM_9_TX", "SLIMBUS_9_TX"},

#ifndef CONFIG_AUXPCM_DISABLE

	{"SLIMBUS_0_RX Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},

	{"SLIMBUS_0_RX Port Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},

	{"SLIMBUS_0_RX Port Mixer", "TERT_AUXPCM_UL_TX", "TERT_AUX_PCM_TX"},

	{"SLIMBUS_0_RX Port Mixer", "QUAT_AUXPCM_UL_TX", "QUAT_AUX_PCM_TX"},

	{"SLIMBUS_0_RX Port Mixer", "QUIN_AUXPCM_UL_TX", "QUIN_AUX_PCM_TX"},

	{"SLIMBUS_0_RX Port Mixer", "SEN_AUXPCM_UL_TX", "SEN_AUX_PCM_TX"},

#endif

	{"SLIMBUS_0_RX Port Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},

	{"SLIMBUS_0_RX", NULL, "SLIMBUS_0_RX Port Mixer"},

	{"AFE_PCM_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},
@@ -27329,7 +27333,9 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"VoLTE Stub Tx Mixer", "STUB_TX_HL", "STUB_TX"},

	{"VoLTE Stub Tx Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},

	{"VoLTE Stub Tx Mixer", "STUB_1_TX_HL", "STUB_1_TX"},

#ifndef CONFIG_AUXPCM_DISABLE

	{"VoLTE Stub Tx Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},

#endif

	{"VoLTE Stub Tx Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"VoLTE Stub Tx Mixer", "SLIM_3_TX", "SLIMBUS_3_TX"},

	{"VoLTE Stub Tx Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},
@@ -27381,7 +27387,9 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"INT_BT_SCO_RX", NULL, "INTERNAL_BT_SCO_RX Port Mixer"},

	{"SLIMBUS_3_RX Port Mixer", "INTERNAL_BT_SCO_RX", "INT_BT_SCO_RX"},

	{"SLIMBUS_3_RX Port Mixer", "AFE_PCM_RX", "PCM_RX"},

#ifndef CONFIG_AUXPCM_DISABLE

	{"SLIMBUS_3_RX Port Mixer", "AUX_PCM_RX", "AUX_PCM_RX"},

#endif

	{"SLIMBUS_3_RX Port Mixer", "SLIM_0_RX", "SLIMBUS_0_RX"},

	{"SLIMBUS_3_RX", NULL, "SLIMBUS_3_RX Port Mixer"},










@@ -27461,7 +27469,9 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"BE_OUT", NULL, "STUB_RX"},















	{"STUB_TX", NULL, "BE_IN"},















	{"STUB_1_TX", NULL, "BE_IN"},













#ifndef CONFIG_AUXPCM_DISABLE















	{"BE_OUT", NULL, "AUX_PCM_RX"},













#endif















	{"INCALL_RECORD_TX", NULL, "BE_IN"},















	{"INCALL_RECORD_RX", NULL, "BE_IN"},















	{"SLIM0_RX_VI_FB_LCH_MUX", "SLIM4_TX", "SLIMBUS_4_TX"},










@@ -28950,8 +28960,10 @@ static const struct snd_soc_dapm_route intercon_tdm[] = {













	{"PRI_TDM_RX_0 Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},















	{"PRI_TDM_RX_0 Port Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},















	{"PRI_TDM_RX_0 Port Mixer", "AFE_PCM_TX", "PCM_TX"},













#ifndef CONFIG_AUXPCM_DISABLE















	{"PRI_TDM_RX_0 Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},















	{"PRI_TDM_RX_0 Port Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},













#endif















	{"PRI_TDM_RX_0 Port Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},















	{"PRI_TDM_RX_0 Port Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},















	{"PRI_TDM_RX_0 Port Mixer", "PRI_TDM_TX_2", "PRI_TDM_TX_2"},