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

Commit 08114e92 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: Fix Tx mute issue over BT-SCO"

parents 8acb8079 f4b3cf13

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

+2 −2
Original line number Diff line number Diff line
@@ -3874,7 +3874,7 @@ static const struct snd_kcontrol_new mmul5_mixer_controls[] = { 
	SOC_SINGLE_EXT("INTERNAL_BT_SCO_TX", MSM_BACKEND_DAI_INT_BT_SCO_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("AUX_PCM_TX", MSM_BACKEND_DAI_AUXPCM_TX,

	SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SEC_AUX_PCM_TX", MSM_BACKEND_DAI_SEC_AUXPCM_TX,
@@ -7990,7 +7990,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia1 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia1 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},

	{"MultiMedia3 Mixer", "AUX_PCM_TX", "AUX_PCM_TX"},

	{"MultiMedia5 Mixer", "AUX_PCM_TX", "AUX_PCM_TX"},

	{"MultiMedia5 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},

	{"MultiMedia1 Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},

	{"MultiMedia3 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},

	{"MultiMedia5 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},