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

Commit e90c4c02 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: Add missing backends for Multimedia4"

parents 0c49d96d b577c15f

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

+20 −0
Original line number Diff line number Diff line
@@ -1965,6 +1965,21 @@ static const struct snd_kcontrol_new mmul4_mixer_controls[] = { 
	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_INT_FM_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("INTERNAL_BT_SCO_TX", MSM_BACKEND_DAI_INT_BT_SCO_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("AFE_PCM_TX", MSM_BACKEND_DAI_AFE_PCM_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("VOC_REC_DL", MSM_BACKEND_DAI_INCALL_RECORD_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("VOC_REC_UL", MSM_BACKEND_DAI_INCALL_RECORD_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

};



static const struct snd_kcontrol_new mmul5_mixer_controls[] = {
@@ -3454,7 +3469,9 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"SLIMBUS_4_RX", NULL, "SLIMBUS_4_RX Audio Mixer"},



	{"MultiMedia1 Mixer", "VOC_REC_UL", "INCALL_RECORD_TX"},

	{"MultiMedia4 Mixer", "VOC_REC_UL", "INCALL_RECORD_TX"},

	{"MultiMedia1 Mixer", "VOC_REC_DL", "INCALL_RECORD_RX"},

	{"MultiMedia4 Mixer", "VOC_REC_DL", "INCALL_RECORD_RX"},

	{"MultiMedia1 Mixer", "SLIM_4_TX", "SLIMBUS_4_TX"},

	{"MultiMedia4 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia4 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},
@@ -3549,11 +3566,14 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"PCM_RX", NULL, "AFE_PCM_RX Audio Mixer"},



	{"MultiMedia1 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},

	{"MultiMedia4 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},

	{"MultiMedia5 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},

	{"MultiMedia1 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},

	{"MultiMedia4 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},

	{"MultiMedia5 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},



	{"MultiMedia1 Mixer", "AFE_PCM_TX", "PCM_TX"},

	{"MultiMedia4 Mixer", "AFE_PCM_TX", "PCM_TX"},

	{"MultiMedia5 Mixer", "AFE_PCM_TX", "PCM_TX"},

	{"MM_UL1", NULL, "MultiMedia1 Mixer"},

	{"MultiMedia2 Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},