Merge "ASoc: msm: Add dai link MultiMedia20 for custom card"
This commit is contained in:
Linux Build Service Account
Gerrit - the friendly Code Review server
commit
3daa107c23
4 changed files with 158 additions and 11 deletions
|
|
@ -3935,19 +3935,22 @@ static struct snd_soc_dai_link apq8096_custom_fe_dai_links[] = {
|
|||
.codec_name = "snd-soc-dummy",
|
||||
},
|
||||
{
|
||||
.name = "Tertiary MI2S TX_Hostless",
|
||||
.stream_name = "Tertiary MI2S_TX Hostless Capture",
|
||||
.cpu_dai_name = "TERT_MI2S_TX_HOSTLESS",
|
||||
.platform_name = "msm-pcm-hostless",
|
||||
.name = "MSM8996 Media20",
|
||||
.stream_name = "MultiMedia20",
|
||||
.cpu_dai_name = "MultiMedia20",
|
||||
.platform_name = "msm-pcm-loopback",
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
|
||||
SND_SOC_DPCM_TRIGGER_POST},
|
||||
.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
|
||||
.ignore_suspend = 1,
|
||||
.ignore_pmdown_time = 1,
|
||||
.codec_dai_name = "snd-soc-dummy-dai",
|
||||
.codec_name = "snd-soc-dummy",
|
||||
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
|
||||
SND_SOC_DPCM_TRIGGER_POST},
|
||||
.ignore_suspend = 1,
|
||||
.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
|
||||
/* this dainlink has playback support */
|
||||
.ignore_pmdown_time = 1,
|
||||
.be_id = MSM_FRONTEND_DAI_MULTIMEDIA20,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2608,6 +2608,39 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
|
|||
.name = "MultiMedia19",
|
||||
.probe = fe_dai_probe,
|
||||
},
|
||||
{
|
||||
.playback = {
|
||||
.stream_name = "MultiMedia20 Playback",
|
||||
.aif_name = "MM_DL20",
|
||||
.rates = (SNDRV_PCM_RATE_8000_384000|
|
||||
SNDRV_PCM_RATE_KNOT),
|
||||
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_3LE |
|
||||
SNDRV_PCM_FMTBIT_S32_LE),
|
||||
.channels_min = 1,
|
||||
.channels_max = 8,
|
||||
.rate_min = 8000,
|
||||
.rate_max = 384000,
|
||||
},
|
||||
.capture = {
|
||||
.stream_name = "MultiMedia20 Capture",
|
||||
.aif_name = "MM_UL20",
|
||||
.rates = (SNDRV_PCM_RATE_8000_48000|
|
||||
SNDRV_PCM_RATE_KNOT),
|
||||
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_3LE |
|
||||
SNDRV_PCM_FMTBIT_S32_LE),
|
||||
.channels_min = 1,
|
||||
.channels_max = 8,
|
||||
.rate_min = 8000,
|
||||
.rate_max = 48000,
|
||||
},
|
||||
.ops = &msm_fe_Multimedia_dai_ops,
|
||||
.name = "MultiMedia20",
|
||||
.probe = fe_dai_probe,
|
||||
},
|
||||
};
|
||||
|
||||
static int msm_fe_dai_dev_probe(struct platform_device *pdev)
|
||||
|
|
|
|||
|
|
@ -595,6 +595,9 @@ static struct msm_pcm_routing_fdai_data
|
|||
{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
|
||||
{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
|
||||
/* MULTIMEDIA19 */
|
||||
{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
|
||||
{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
|
||||
/* MULTIMEDIA20 */
|
||||
{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
|
||||
{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
|
||||
/* CS_VOICE */
|
||||
|
|
@ -5459,6 +5462,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_0_mixer_controls[] = {
|
|||
SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_QUAT_TDM_RX_0,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("MultiMedia20", MSM_BACKEND_DAI_QUAT_TDM_RX_0,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new quat_tdm_tx_0_mixer_controls[] = {
|
||||
|
|
@ -5561,6 +5567,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_1_mixer_controls[] = {
|
|||
SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_QUAT_TDM_RX_1,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("MultiMedia20", MSM_BACKEND_DAI_QUAT_TDM_RX_1,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new quat_tdm_rx_2_mixer_controls[] = {
|
||||
|
|
@ -5612,6 +5621,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_2_mixer_controls[] = {
|
|||
SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_QUAT_TDM_RX_2,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("MultiMedia20", MSM_BACKEND_DAI_QUAT_TDM_RX_2,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new quat_tdm_rx_3_mixer_controls[] = {
|
||||
|
|
@ -5663,6 +5675,9 @@ static const struct snd_kcontrol_new quat_tdm_rx_3_mixer_controls[] = {
|
|||
SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_QUAT_TDM_RX_3,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("MultiMedia20", MSM_BACKEND_DAI_QUAT_TDM_RX_3,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new mmul1_mixer_controls[] = {
|
||||
|
|
@ -6474,6 +6489,70 @@ static const struct snd_kcontrol_new mmul19_mixer_controls[] = {
|
|||
MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new mmul20_mixer_controls[] = {
|
||||
SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("SEC_MI2S_TX", MSM_BACKEND_DAI_SECONDARY_MI2S_TX,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("PRI_TDM_TX_0", MSM_BACKEND_DAI_PRI_TDM_TX_0,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("PRI_TDM_TX_1", MSM_BACKEND_DAI_PRI_TDM_TX_1,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("PRI_TDM_TX_2", MSM_BACKEND_DAI_PRI_TDM_TX_2,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("PRI_TDM_TX_3", MSM_BACKEND_DAI_PRI_TDM_TX_3,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("SEC_TDM_TX_0", MSM_BACKEND_DAI_SEC_TDM_TX_0,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("SEC_TDM_TX_1", MSM_BACKEND_DAI_SEC_TDM_TX_1,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("SEC_TDM_TX_2", MSM_BACKEND_DAI_SEC_TDM_TX_2,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("SEC_TDM_TX_3", MSM_BACKEND_DAI_SEC_TDM_TX_3,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("TERT_TDM_TX_0", MSM_BACKEND_DAI_TERT_TDM_TX_0,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("TERT_TDM_TX_1", MSM_BACKEND_DAI_TERT_TDM_TX_1,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("TERT_TDM_TX_2", MSM_BACKEND_DAI_TERT_TDM_TX_2,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("TERT_TDM_TX_3", MSM_BACKEND_DAI_TERT_TDM_TX_3,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("QUAT_TDM_TX_0", MSM_BACKEND_DAI_QUAT_TDM_TX_0,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("QUAT_TDM_TX_1", MSM_BACKEND_DAI_QUAT_TDM_TX_1,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("QUAT_TDM_TX_2", MSM_BACKEND_DAI_QUAT_TDM_TX_2,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("QUAT_TDM_TX_3", MSM_BACKEND_DAI_QUAT_TDM_TX_3,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new pri_rx_voice_mixer_controls[] = {
|
||||
SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_PRI_I2S_RX,
|
||||
MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer,
|
||||
|
|
@ -10511,6 +10590,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
|
|||
SND_SOC_DAPM_AIF_IN("MM_DL14", "MultiMedia14 Playback", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_IN("MM_DL15", "MultiMedia15 Playback", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_IN("MM_DL16", "MultiMedia16 Playback", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_IN("MM_DL20", "MultiMedia20 Playback", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_IN("VOIP_DL", "VoIP Playback", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_OUT("MM_UL1", "MultiMedia1 Capture", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_OUT("MM_UL2", "MultiMedia2 Capture", 0, 0, 0, 0),
|
||||
|
|
@ -10523,6 +10603,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
|
|||
SND_SOC_DAPM_AIF_OUT("MM_UL17", "MultiMedia17 Capture", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_OUT("MM_UL18", "MultiMedia18 Capture", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_OUT("MM_UL19", "MultiMedia19 Capture", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_OUT("MM_UL20", "MultiMedia20 Capture", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_IN("CS-VOICE_DL1", "CS-VOICE Playback", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_OUT("CS-VOICE_UL1", "CS-VOICE Capture", 0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_IN("VOICE2_DL", "Voice2 Playback", 0, 0, 0, 0),
|
||||
|
|
@ -11261,6 +11342,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
|
|||
mmul18_mixer_controls, ARRAY_SIZE(mmul18_mixer_controls)),
|
||||
SND_SOC_DAPM_MIXER("MultiMedia19 Mixer", SND_SOC_NOPM, 0, 0,
|
||||
mmul19_mixer_controls, ARRAY_SIZE(mmul19_mixer_controls)),
|
||||
SND_SOC_DAPM_MIXER("MultiMedia20 Mixer", SND_SOC_NOPM, 0, 0,
|
||||
mmul20_mixer_controls, ARRAY_SIZE(mmul20_mixer_controls)),
|
||||
SND_SOC_DAPM_MIXER("AUX_PCM_RX Audio Mixer", SND_SOC_NOPM, 0, 0,
|
||||
auxpcm_rx_mixer_controls, ARRAY_SIZE(auxpcm_rx_mixer_controls)),
|
||||
SND_SOC_DAPM_MIXER("SEC_AUX_PCM_RX Audio Mixer", SND_SOC_NOPM, 0, 0,
|
||||
|
|
@ -12282,6 +12365,7 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|||
{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia14", "MM_DL14"},
|
||||
{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia15", "MM_DL15"},
|
||||
{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia16", "MM_DL16"},
|
||||
{"QUAT_TDM_RX_0 Audio Mixer", "MultiMedia20", "MM_DL20"},
|
||||
{"QUAT_TDM_RX_0", NULL, "QUAT_TDM_RX_0 Audio Mixer"},
|
||||
|
||||
{"PRI_TDM_RX_0 Audio Mixer", "MultiMedia1", "MM_DL1"},
|
||||
|
|
@ -12354,6 +12438,7 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|||
{"QUAT_TDM_RX_1 Audio Mixer", "MultiMedia14", "MM_DL14"},
|
||||
{"QUAT_TDM_RX_1 Audio Mixer", "MultiMedia15", "MM_DL15"},
|
||||
{"QUAT_TDM_RX_1 Audio Mixer", "MultiMedia16", "MM_DL16"},
|
||||
{"QUAT_TDM_RX_1 Audio Mixer", "MultiMedia20", "MM_DL20"},
|
||||
{"QUAT_TDM_RX_1", NULL, "QUAT_TDM_RX_1 Audio Mixer"},
|
||||
|
||||
{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia1", "MM_DL1"},
|
||||
|
|
@ -12372,6 +12457,7 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|||
{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia14", "MM_DL14"},
|
||||
{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia15", "MM_DL15"},
|
||||
{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia16", "MM_DL16"},
|
||||
{"QUAT_TDM_RX_2 Audio Mixer", "MultiMedia20", "MM_DL20"},
|
||||
{"QUAT_TDM_RX_2", NULL, "QUAT_TDM_RX_2 Audio Mixer"},
|
||||
|
||||
{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia1", "MM_DL1"},
|
||||
|
|
@ -12390,6 +12476,7 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|||
{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia14", "MM_DL14"},
|
||||
{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia15", "MM_DL15"},
|
||||
{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia16", "MM_DL16"},
|
||||
{"QUAT_TDM_RX_3 Audio Mixer", "MultiMedia20", "MM_DL20"},
|
||||
{"QUAT_TDM_RX_3", NULL, "QUAT_TDM_RX_3 Audio Mixer"},
|
||||
|
||||
{"MultiMedia1 Mixer", "PRI_TX", "PRI_I2S_TX"},
|
||||
|
|
@ -12441,6 +12528,7 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|||
{"MultiMedia6 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},
|
||||
{"MultiMedia6 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},
|
||||
{"MultiMedia6 Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},
|
||||
{"MultiMedia6 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},
|
||||
|
||||
{"MultiMedia1 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
|
||||
{"MultiMedia1 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
|
||||
|
|
@ -12570,6 +12658,27 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|||
{"MultiMedia9 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},
|
||||
{"MultiMedia9 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},
|
||||
|
||||
{"MultiMedia20 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},
|
||||
{"MultiMedia20 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},
|
||||
{"MultiMedia20 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
|
||||
{"MultiMedia20 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},
|
||||
{"MultiMedia20 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
|
||||
{"MultiMedia20 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
|
||||
{"MultiMedia20 Mixer", "PRI_TDM_TX_2", "PRI_TDM_TX_2"},
|
||||
{"MultiMedia20 Mixer", "PRI_TDM_TX_3", "PRI_TDM_TX_3"},
|
||||
{"MultiMedia20 Mixer", "SEC_TDM_TX_0", "SEC_TDM_TX_0"},
|
||||
{"MultiMedia20 Mixer", "SEC_TDM_TX_1", "SEC_TDM_TX_1"},
|
||||
{"MultiMedia20 Mixer", "SEC_TDM_TX_2", "SEC_TDM_TX_2"},
|
||||
{"MultiMedia20 Mixer", "SEC_TDM_TX_3", "SEC_TDM_TX_3"},
|
||||
{"MultiMedia20 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},
|
||||
{"MultiMedia20 Mixer", "TERT_TDM_TX_1", "TERT_TDM_TX_1"},
|
||||
{"MultiMedia20 Mixer", "TERT_TDM_TX_2", "TERT_TDM_TX_2"},
|
||||
{"MultiMedia20 Mixer", "TERT_TDM_TX_3", "TERT_TDM_TX_3"},
|
||||
{"MultiMedia20 Mixer", "QUAT_TDM_TX_0", "QUAT_TDM_TX_0"},
|
||||
{"MultiMedia20 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},
|
||||
{"MultiMedia20 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},
|
||||
{"MultiMedia20 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},
|
||||
|
||||
{"MultiMedia1 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},
|
||||
{"MultiMedia2 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},
|
||||
{"MultiMedia4 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},
|
||||
|
|
@ -12688,6 +12797,7 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|||
{"MM_UL17", NULL, "MultiMedia17 Mixer"},
|
||||
{"MM_UL18", NULL, "MultiMedia18 Mixer"},
|
||||
{"MM_UL19", NULL, "MultiMedia19 Mixer"},
|
||||
{"MM_UL20", NULL, "MultiMedia20 Mixer"},
|
||||
|
||||
{"AUX_PCM_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
|
||||
{"AUX_PCM_RX Audio Mixer", "MultiMedia2", "MM_DL2"},
|
||||
|
|
|
|||
|
|
@ -192,6 +192,7 @@ enum {
|
|||
MSM_FRONTEND_DAI_MULTIMEDIA17,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA18,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA19,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA20,
|
||||
MSM_FRONTEND_DAI_CS_VOICE,
|
||||
MSM_FRONTEND_DAI_VOIP,
|
||||
MSM_FRONTEND_DAI_AFE_RX,
|
||||
|
|
@ -217,8 +218,8 @@ enum {
|
|||
MSM_FRONTEND_DAI_MAX,
|
||||
};
|
||||
|
||||
#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA19 + 1)
|
||||
#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA19
|
||||
#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA20 + 1)
|
||||
#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA20
|
||||
|
||||
enum {
|
||||
MSM_BACKEND_DAI_PRI_I2S_RX = 0,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue