|
@@ -11383,6 +11383,58 @@ static const struct snd_kcontrol_new mmul20_mixer_controls[] = {
|
|
|
MSM_BACKEND_DAI_QUIN_TDM_TX_3,
|
|
|
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("WSA_CDC_DMA_TX_0", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_WSA_CDC_DMA_TX_0,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("WSA_CDC_DMA_TX_1", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_WSA_CDC_DMA_TX_1,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("WSA_CDC_DMA_TX_2", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_WSA_CDC_DMA_TX_2,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("VA_CDC_DMA_TX_0", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("VA_CDC_DMA_TX_1", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("TX_CDC_DMA_TX_0", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_0,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("TX_CDC_DMA_TX_1", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_1,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("TX_CDC_DMA_TX_2", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_2,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("TX_CDC_DMA_TX_3", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_3,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("TX_CDC_DMA_TX_4", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_4,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("TX_CDC_DMA_TX_5", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_5,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("PRI_SPDIF_TX", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_PRI_SPDIF_TX,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
+ SOC_DOUBLE_EXT("SEC_SPDIF_TX", SND_SOC_NOPM,
|
|
|
+ MSM_BACKEND_DAI_SEC_SPDIF_TX,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
};
|
|
|
|
|
|
static const struct snd_kcontrol_new mmul21_mixer_controls[] = {
|
|
@@ -11475,62 +11527,56 @@ static const struct snd_kcontrol_new mmul21_mixer_controls[] = {
|
|
|
MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("WSA_CDC_DMA_TX_0", SND_SOC_NOPM,
|
|
|
- MSM_BACKEND_DAI_WSA_CDC_DMA_TX_0,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ MSM_BACKEND_DAI_WSA_CDC_DMA_TX_0,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("WSA_CDC_DMA_TX_1", SND_SOC_NOPM,
|
|
|
- MSM_BACKEND_DAI_WSA_CDC_DMA_TX_1,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ MSM_BACKEND_DAI_WSA_CDC_DMA_TX_1,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("WSA_CDC_DMA_TX_2", SND_SOC_NOPM,
|
|
|
- MSM_BACKEND_DAI_WSA_CDC_DMA_TX_2,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ MSM_BACKEND_DAI_WSA_CDC_DMA_TX_2,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("VA_CDC_DMA_TX_0", SND_SOC_NOPM,
|
|
|
- MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("VA_CDC_DMA_TX_1", SND_SOC_NOPM,
|
|
|
- MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("TX_CDC_DMA_TX_0", SND_SOC_NOPM,
|
|
|
- MSM_BACKEND_DAI_TX_CDC_DMA_TX_0,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0,
|
|
|
- msm_routing_get_audio_mixer,
|
|
|
- msm_routing_put_audio_mixer),
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_0,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("TX_CDC_DMA_TX_1", SND_SOC_NOPM,
|
|
|
- MSM_BACKEND_DAI_TX_CDC_DMA_TX_1,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0,
|
|
|
- msm_routing_get_audio_mixer,
|
|
|
- msm_routing_put_audio_mixer),
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_1,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("TX_CDC_DMA_TX_2", SND_SOC_NOPM,
|
|
|
- MSM_BACKEND_DAI_TX_CDC_DMA_TX_2,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0,
|
|
|
- msm_routing_get_audio_mixer,
|
|
|
- msm_routing_put_audio_mixer),
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_2,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("TX_CDC_DMA_TX_3", SND_SOC_NOPM,
|
|
|
- MSM_BACKEND_DAI_TX_CDC_DMA_TX_3,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0,
|
|
|
- msm_routing_get_audio_mixer,
|
|
|
- msm_routing_put_audio_mixer),
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_3,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("TX_CDC_DMA_TX_4", SND_SOC_NOPM,
|
|
|
- MSM_BACKEND_DAI_TX_CDC_DMA_TX_4,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0,
|
|
|
- msm_routing_get_audio_mixer,
|
|
|
- msm_routing_put_audio_mixer),
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_4,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("TX_CDC_DMA_TX_5", SND_SOC_NOPM,
|
|
|
- MSM_BACKEND_DAI_TX_CDC_DMA_TX_5,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0,
|
|
|
- msm_routing_get_audio_mixer,
|
|
|
- msm_routing_put_audio_mixer),
|
|
|
+ MSM_BACKEND_DAI_TX_CDC_DMA_TX_5,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("PRI_SPDIF_TX", SND_SOC_NOPM,
|
|
|
MSM_BACKEND_DAI_PRI_SPDIF_TX,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
msm_routing_put_audio_mixer),
|
|
|
SOC_DOUBLE_EXT("SEC_SPDIF_TX", SND_SOC_NOPM,
|
|
|
MSM_BACKEND_DAI_SEC_SPDIF_TX,
|
|
|
- MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
|
|
+ MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,
|
|
|
msm_routing_put_audio_mixer),
|
|
|
};
|
|
|
|
|
@@ -20342,7 +20388,6 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|
|
{"MultiMedia8 Mixer", "WSA_CDC_DMA_TX_2", "WSA_CDC_DMA_TX_2"},
|
|
|
{"MultiMedia8 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},
|
|
|
{"MultiMedia8 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
|
|
|
- {"MultiMedia8 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
|
|
|
{"MultiMedia8 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},
|
|
|
{"MultiMedia8 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},
|
|
|
{"MultiMedia8 Mixer", "TX_CDC_DMA_TX_2", "TX_CDC_DMA_TX_2"},
|
|
@@ -20369,7 +20414,6 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|
|
{"MultiMedia9 Mixer", "WSA_CDC_DMA_TX_2", "WSA_CDC_DMA_TX_2"},
|
|
|
{"MultiMedia9 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},
|
|
|
{"MultiMedia9 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
|
|
|
- {"MultiMedia9 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
|
|
|
{"MultiMedia9 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},
|
|
|
{"MultiMedia9 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},
|
|
|
{"MultiMedia9 Mixer", "TX_CDC_DMA_TX_2", "TX_CDC_DMA_TX_2"},
|
|
@@ -20424,7 +20468,6 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|
|
{"MultiMedia20 Mixer", "WSA_CDC_DMA_TX_2", "WSA_CDC_DMA_TX_2"},
|
|
|
{"MultiMedia20 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},
|
|
|
{"MultiMedia20 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
|
|
|
- {"MultiMedia20 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
|
|
|
{"MultiMedia20 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},
|
|
|
{"MultiMedia20 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},
|
|
|
{"MultiMedia20 Mixer", "TX_CDC_DMA_TX_2", "TX_CDC_DMA_TX_2"},
|
|
@@ -20456,6 +20499,19 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|
|
{"MultiMedia21 Mixer", "QUIN_TDM_TX_1", "QUIN_TDM_TX_1"},
|
|
|
{"MultiMedia21 Mixer", "QUIN_TDM_TX_2", "QUIN_TDM_TX_2"},
|
|
|
{"MultiMedia21 Mixer", "QUIN_TDM_TX_3", "QUIN_TDM_TX_3"},
|
|
|
+ {"MultiMedia21 Mixer", "WSA_CDC_DMA_TX_0", "WSA_CDC_DMA_TX_0"},
|
|
|
+ {"MultiMedia21 Mixer", "WSA_CDC_DMA_TX_1", "WSA_CDC_DMA_TX_1"},
|
|
|
+ {"MultiMedia21 Mixer", "WSA_CDC_DMA_TX_2", "WSA_CDC_DMA_TX_2"},
|
|
|
+ {"MultiMedia21 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},
|
|
|
+ {"MultiMedia21 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
|
|
|
+ {"MultiMedia21 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},
|
|
|
+ {"MultiMedia21 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},
|
|
|
+ {"MultiMedia21 Mixer", "TX_CDC_DMA_TX_2", "TX_CDC_DMA_TX_2"},
|
|
|
+ {"MultiMedia21 Mixer", "TX_CDC_DMA_TX_3", "TX_CDC_DMA_TX_3"},
|
|
|
+ {"MultiMedia21 Mixer", "TX_CDC_DMA_TX_4", "TX_CDC_DMA_TX_4"},
|
|
|
+ {"MultiMedia21 Mixer", "TX_CDC_DMA_TX_5", "TX_CDC_DMA_TX_5"},
|
|
|
+ {"MultiMedia21 Mixer", "PRI_SPDIF_TX", "PRI_SPDIF_TX"},
|
|
|
+ {"MultiMedia21 Mixer", "SEC_SPDIF_TX", "SEC_SPDIF_TX"},
|
|
|
|
|
|
{"MultiMedia1 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},
|
|
|
{"MultiMedia2 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},
|
|
@@ -20487,7 +20543,6 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|
|
{"MultiMedia16 Mixer", "WSA_CDC_DMA_TX_2", "WSA_CDC_DMA_TX_2"},
|
|
|
{"MultiMedia16 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},
|
|
|
{"MultiMedia16 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
|
|
|
- {"MultiMedia16 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},
|
|
|
{"MultiMedia16 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},
|
|
|
{"MultiMedia16 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},
|
|
|
{"MultiMedia16 Mixer", "TX_CDC_DMA_TX_2", "TX_CDC_DMA_TX_2"},
|