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

Commit 2e16cc4a 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: qdsp6v2: support TDM to AUX_PCM loopback for BT HFP uplink"

parents 622371ed 2aa30634

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

+5 −0
Original line number Diff line number Diff line
@@ -6302,6 +6302,9 @@ static const struct snd_kcontrol_new aux_pcm_rx_port_mixer_controls[] = { 
	SOC_SINGLE_EXT("SEC_AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_RX,

	MSM_BACKEND_DAI_SEC_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("QUAT_TDM_TX_0", MSM_BACKEND_DAI_AUXPCM_RX,

	MSM_BACKEND_DAI_QUAT_TDM_TX_0, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

};



static const struct snd_kcontrol_new sec_auxpcm_rx_port_mixer_controls[] = {
@@ -11025,6 +11028,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"INTHFP_UL_HL", "NULL", "HFP_INT_UL_HL"},

	{"HFP_INT_UL_HL", "Switch", "INT_BT_SCO_TX"},

	{"AUX_PCM_RX", NULL, "AUXPCM_DL_HL"},

	{"AUX_PCM_RX", NULL, "INTHFP_DL_HL"},

	{"AUXPCM_UL_HL", NULL, "AUX_PCM_TX"},

	{"MI2S_RX", NULL, "MI2S_DL_HL"},

	{"MI2S_UL_HL", NULL, "MI2S_TX"},
@@ -11390,6 +11394,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"AUX_PCM_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"AUX_PCM_RX Port Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},

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

	{"AUX_PCM_RX Port Mixer", "QUAT_TDM_TX_0", "QUAT_TDM_TX_0"},

	{"AUX_PCM_RX", NULL, "AUX_PCM_RX Port Mixer"},



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