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

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

Merge "asoc: add routing control for Multimedia17 with USB TX"

parents 1623b7cf aa736b24

asoc/msm-pcm-routing-v2.c

+5 −0
Original line number Diff line number Diff line
@@ -14457,6 +14457,10 @@ static const struct snd_kcontrol_new mmul17_mixer_controls[] = { 
	MSM_BACKEND_DAI_SLIMBUS_7_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("USB_AUDIO_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_USB_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

};















static const struct snd_kcontrol_new mmul18_mixer_controls[] = {










@@ -25254,6 +25258,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia17 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},















	{"MultiMedia17 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},















	{"MultiMedia17 Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},













	{"MultiMedia17 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},















	{"MultiMedia18 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},















	{"MultiMedia18 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},















	{"MultiMedia19 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},