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

Commit e95f3de0 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: Add multimedia9 routing support"

parents 4006d3b5 860b1564

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

+4 −0
Original line number Diff line number Diff line
@@ -5201,6 +5201,9 @@ static const struct snd_kcontrol_new mmul9_mixer_controls[] = { 
	SOC_SINGLE_EXT("QUAT_TDM_TX_3", MSM_BACKEND_DAI_QUAT_TDM_TX_3,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

};



static const struct snd_kcontrol_new mmul17_mixer_controls[] = {
@@ -10334,6 +10337,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia9 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},

	{"MultiMedia9 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},

	{"MultiMedia9 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},

	{"MultiMedia9 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},



	{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia1", "MM_DL1"},

	{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia2", "MM_DL2"},