diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c index ad5c46dde230..c4cffbfcc3df 100644 --- a/asoc/msm-pcm-routing-v2.c +++ b/asoc/msm-pcm-routing-v2.c @@ -8413,6 +8413,10 @@ static const struct snd_kcontrol_new display_port_mixer_controls[] = { MSM_BACKEND_DAI_DISPLAY_PORT_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_DISPLAY_PORT_RX, + MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; static const struct snd_kcontrol_new display_port1_mixer_controls[] = { @@ -8484,6 +8488,10 @@ static const struct snd_kcontrol_new display_port1_mixer_controls[] = { MSM_BACKEND_DAI_DISPLAY_PORT_RX_1, 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_DISPLAY_PORT_RX_1, + MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; /* incall music delivery mixer */ @@ -9993,6 +10001,10 @@ static const struct snd_kcontrol_new afe_pcm_rx_mixer_controls[] = { MSM_BACKEND_DAI_AFE_PCM_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_AFE_PCM_RX, + MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; static const struct snd_kcontrol_new afe_pcm_rx_1_mixer_controls[] = { @@ -10088,6 +10100,10 @@ static const struct snd_kcontrol_new afe_pcm_rx_1_mixer_controls[] = { MSM_BACKEND_DAI_AFE_PCM_RX1, 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_AFE_PCM_RX1, + MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; #ifndef CONFIG_AUXPCM_DISABLE @@ -10188,6 +10204,10 @@ static const struct snd_kcontrol_new auxpcm_rx_mixer_controls[] = { MSM_BACKEND_DAI_AUXPCM_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_AUXPCM_RX, + MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; static const struct snd_kcontrol_new sec_auxpcm_rx_mixer_controls[] = { @@ -10287,6 +10307,10 @@ static const struct snd_kcontrol_new sec_auxpcm_rx_mixer_controls[] = { MSM_BACKEND_DAI_SEC_AUXPCM_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_SEC_AUXPCM_RX, + MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; static const struct snd_kcontrol_new tert_auxpcm_rx_mixer_controls[] = { @@ -10358,6 +10382,10 @@ static const struct snd_kcontrol_new tert_auxpcm_rx_mixer_controls[] = { MSM_BACKEND_DAI_TERT_AUXPCM_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_TERT_AUXPCM_RX, + MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; static const struct snd_kcontrol_new quat_auxpcm_rx_mixer_controls[] = { @@ -10429,6 +10457,10 @@ static const struct snd_kcontrol_new quat_auxpcm_rx_mixer_controls[] = { MSM_BACKEND_DAI_QUAT_AUXPCM_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_QUAT_AUXPCM_RX, + MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; static const struct snd_kcontrol_new quin_auxpcm_rx_mixer_controls[] = { @@ -10500,6 +10532,10 @@ static const struct snd_kcontrol_new quin_auxpcm_rx_mixer_controls[] = { MSM_BACKEND_DAI_QUIN_AUXPCM_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_QUIN_AUXPCM_RX, + MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; static const struct snd_kcontrol_new sen_auxpcm_rx_mixer_controls[] = { @@ -10571,6 +10607,10 @@ static const struct snd_kcontrol_new sen_auxpcm_rx_mixer_controls[] = { MSM_BACKEND_DAI_SEN_AUXPCM_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_SEN_AUXPCM_RX, + MSM_FRONTEND_DAI_MULTIMEDIA31, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; #endif @@ -26436,6 +26476,7 @@ static const struct snd_soc_dapm_route intercon[] = { {"DISPLAY_PORT Mixer", "MultiMedia15", "MM_DL15"}, {"DISPLAY_PORT Mixer", "MultiMedia16", "MM_DL16"}, {"DISPLAY_PORT Mixer", "MultiMedia26", "MM_DL26"}, + {"DISPLAY_PORT Mixer", "MultiMedia31", "MM_DL31"}, {"DISPLAY_PORT", NULL, "DISPLAY_PORT Mixer"}, {"DISPLAY_PORT1 Mixer", "MultiMedia1", "MM_DL1"}, @@ -26455,6 +26496,7 @@ static const struct snd_soc_dapm_route intercon[] = { {"DISPLAY_PORT1 Mixer", "MultiMedia15", "MM_DL15"}, {"DISPLAY_PORT1 Mixer", "MultiMedia16", "MM_DL16"}, {"DISPLAY_PORT1 Mixer", "MultiMedia26", "MM_DL26"}, + {"DISPLAY_PORT1 Mixer", "MultiMedia31", "MM_DL31"}, {"DISPLAY_PORT1", NULL, "DISPLAY_PORT1 Mixer"}, {"PRI_SPDIF_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, @@ -27035,6 +27077,7 @@ static const struct snd_soc_dapm_route intercon[] = { {"AFE_PCM_RX Audio Mixer", "MultiMedia14", "MM_DL14"}, {"AFE_PCM_RX Audio Mixer", "MultiMedia15", "MM_DL15"}, {"AFE_PCM_RX Audio Mixer", "MultiMedia16", "MM_DL16"}, + {"AFE_PCM_RX Audio Mixer", "MultiMedia31", "MM_DL31"}, {"PCM_RX", NULL, "AFE_PCM_RX Audio Mixer"}, {"AFE_PCM_RX1 Audio Mixer", "MultiMedia1", "MM_DL1"}, @@ -27053,6 +27096,7 @@ static const struct snd_soc_dapm_route intercon[] = { {"AFE_PCM_RX1 Audio Mixer", "MultiMedia14", "MM_DL14"}, {"AFE_PCM_RX1 Audio Mixer", "MultiMedia15", "MM_DL15"}, {"AFE_PCM_RX1 Audio Mixer", "MultiMedia16", "MM_DL16"}, + {"AFE_PCM_RX1 Audio Mixer", "MultiMedia31", "MM_DL31"}, {"PCM_RX1", NULL, "AFE_PCM_RX1 Audio Mixer"}, {"MultiMedia1 Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"}, @@ -27695,6 +27739,7 @@ static const struct snd_soc_dapm_route intercon_aux_pcm[] = { {"AUX_PCM_RX Audio Mixer", "MultiMedia15", "MM_DL15"}, {"AUX_PCM_RX Audio Mixer", "MultiMedia16", "MM_DL16"}, {"AUX_PCM_RX Audio Mixer", "MultiMedia21", "MM_DL21"}, + {"AUX_PCM_RX Audio Mixer", "MultiMedia31", "MM_DL31"}, {"AUX_PCM_RX", NULL, "AUX_PCM_RX Audio Mixer"}, {"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, @@ -27714,6 +27759,7 @@ static const struct snd_soc_dapm_route intercon_aux_pcm[] = { {"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia15", "MM_DL15"}, {"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia16", "MM_DL16"}, {"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia21", "MM_DL21"}, + {"SEC_AUX_PCM_RX Audio Mixer", "MultiMedia31", "MM_DL31"}, {"SEC_AUX_PCM_RX", NULL, "SEC_AUX_PCM_RX Audio Mixer"}, {"TERT_AUX_PCM_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, @@ -27732,6 +27778,7 @@ static const struct snd_soc_dapm_route intercon_aux_pcm[] = { {"TERT_AUX_PCM_RX Audio Mixer", "MultiMedia14", "MM_DL14"}, {"TERT_AUX_PCM_RX Audio Mixer", "MultiMedia15", "MM_DL15"}, {"TERT_AUX_PCM_RX Audio Mixer", "MultiMedia16", "MM_DL16"}, + {"TERT_AUX_PCM_RX Audio Mixer", "MultiMedia31", "MM_DL31"}, {"TERT_AUX_PCM_RX", NULL, "TERT_AUX_PCM_RX Audio Mixer"}, {"QUAT_AUX_PCM_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, @@ -27750,6 +27797,7 @@ static const struct snd_soc_dapm_route intercon_aux_pcm[] = { {"QUAT_AUX_PCM_RX Audio Mixer", "MultiMedia14", "MM_DL14"}, {"QUAT_AUX_PCM_RX Audio Mixer", "MultiMedia15", "MM_DL15"}, {"QUAT_AUX_PCM_RX Audio Mixer", "MultiMedia16", "MM_DL16"}, + {"QUAT_AUX_PCM_RX Audio Mixer", "MultiMedia31", "MM_DL31"}, {"QUAT_AUX_PCM_RX", NULL, "QUAT_AUX_PCM_RX Audio Mixer"}, {"QUIN_AUX_PCM_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, @@ -27768,6 +27816,7 @@ static const struct snd_soc_dapm_route intercon_aux_pcm[] = { {"QUIN_AUX_PCM_RX Audio Mixer", "MultiMedia14", "MM_DL14"}, {"QUIN_AUX_PCM_RX Audio Mixer", "MultiMedia15", "MM_DL15"}, {"QUIN_AUX_PCM_RX Audio Mixer", "MultiMedia16", "MM_DL16"}, + {"QUIN_AUX_PCM_RX Audio Mixer", "MultiMedia31", "MM_DL31"}, {"QUIN_AUX_PCM_RX", NULL, "QUIN_AUX_PCM_RX Audio Mixer"}, {"SEN_AUX_PCM_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, @@ -27786,6 +27835,7 @@ static const struct snd_soc_dapm_route intercon_aux_pcm[] = { {"SEN_AUX_PCM_RX Audio Mixer", "MultiMedia14", "MM_DL14"}, {"SEN_AUX_PCM_RX Audio Mixer", "MultiMedia15", "MM_DL15"}, {"SEN_AUX_PCM_RX Audio Mixer", "MultiMedia16", "MM_DL16"}, + {"SEN_AUX_PCM_RX Audio Mixer", "MultiMedia31", "MM_DL31"}, {"SEN_AUX_PCM_RX", NULL, "SEN_AUX_PCM_RX Audio Mixer"}, {"AUX_PCM_RX_Voice Mixer", "Voip", "VOIP_DL"},