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

Commit 9f49c9c2 authored by Cong Tang's avatar Cong Tang Committed by Banajit Goswami
Browse files

ASoc: msm: support SEC_MI2S_TX port routing to MultiMedia20 



Add new frontend MultiMedia20 and update routing to support ASM
Loopback from SEC_MI2S_TX port to TDM port.

CRs-Fixed: 2045651
Change-Id: Ief9ebfda4469d0761ff96bf673b9d593a9576f44
Signed-off-by: default avatarCong Tang <congt@codeaurora.org>
parent 05873c64

sound/soc/msm/msm-dai-fe.c

+33 −0
Original line number Diff line number Diff line
@@ -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)

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+110 −0
Original line number Diff line number Diff line
@@ -597,6 +597,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 */
@@ -5475,6 +5478,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[] = {










@@ -5577,6 +5583,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[] = {










@@ -5628,6 +5637,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[] = {










@@ -5679,6 +5691,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[] = {










@@ -6490,6 +6505,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,










@@ -10530,6 +10609,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),









@@ -10542,6 +10622,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),










@@ -11279,6 +11360,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,










@@ -12300,6 +12383,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"},










@@ -12372,6 +12456,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"},









@@ -12390,6 +12475,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"},









@@ -12408,6 +12494,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"},










@@ -12459,6 +12546,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"},










@@ -12588,6 +12676,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"},










@@ -12706,6 +12815,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"},

























sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.h



+3
−2




























Original line number
Diff line number
Diff line








@@ -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,