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

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

Merge "asoc: add MM31 playback on USB and BT devices"

parents ce0d9164 87f632b0

asoc/msm-pcm-routing-v2.c

+14 −0
Original line number Diff line number Diff line
@@ -9106,6 +9106,10 @@ static const struct snd_kcontrol_new usb_audio_rx_mixer_controls[] = { 
	MSM_BACKEND_DAI_USB_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("MultiMedia31", SND_SOC_NOPM,

	MSM_BACKEND_DAI_USB_RX,

	MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

};









static const struct snd_kcontrol_new int_bt_sco_rx_mixer_controls[] = {








@@ -9201,6 +9205,10 @@ static const struct snd_kcontrol_new int_bt_sco_rx_mixer_controls[] = {







	MSM_BACKEND_DAI_INT_BT_SCO_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA30, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_DOUBLE_EXT("MultiMedia31", SND_SOC_NOPM,









	MSM_BACKEND_DAI_INT_BT_SCO_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new int_bt_a2dp_rx_mixer_controls[] = {








@@ -9272,6 +9280,10 @@ static const struct snd_kcontrol_new int_bt_a2dp_rx_mixer_controls[] = {







	MSM_BACKEND_DAI_INT_BT_A2DP_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









	SOC_DOUBLE_EXT("MultiMedia31", SND_SOC_NOPM,









	MSM_BACKEND_DAI_INT_BT_A2DP_RX,









	MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer,









	msm_routing_put_audio_mixer),









};

















static const struct snd_kcontrol_new int_fm_rx_mixer_controls[] = {








@@ -26108,6 +26120,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"SLIMBUS_7_RX Audio Mixer", "MultiMedia15", "MM_DL15"},









	{"SLIMBUS_7_RX Audio Mixer", "MultiMedia16", "MM_DL16"},









	{"SLIMBUS_7_RX Audio Mixer", "MultiMedia26", "MM_DL26"},









	{"SLIMBUS_7_RX Audio Mixer", "MultiMedia31", "MM_DL31"},









	{"SLIMBUS_7_RX", NULL, "SLIMBUS_7_RX Audio Mixer"},

















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








@@ -26146,6 +26159,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"USB_AUDIO_RX Audio Mixer", "MultiMedia15", "MM_DL15"},









	{"USB_AUDIO_RX Audio Mixer", "MultiMedia16", "MM_DL16"},









	{"USB_AUDIO_RX Audio Mixer", "MultiMedia26", "MM_DL26"},









	{"USB_AUDIO_RX Audio Mixer", "MultiMedia31", "MM_DL31"},









	{"USB_AUDIO_RX", NULL, "USB_AUDIO_RX Audio Mixer"},

















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