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

Commit 951cbb66 authored by Viraja Kommaraju's avatar Viraja Kommaraju Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: qdsp6v2: Update routing and FE DAI drivers 



Update routing driver with port mixer commands between
primary and secondary interfaces to enable AFE lopback
between them. Update FE DAI driver to add hostless FEs
for primary/secondary Auxpcm and secondary MI2S.

CRs-fixed: 2105222
Change-Id: I4bab442dae76d2a81f52883c4b0171253f6d9fe9
Signed-off-by: default avatarViraja Kommaraju <virajak@codeaurora.org>
parent c965b244

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

+30 −0
Original line number Diff line number Diff line
@@ -628,6 +628,36 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.name = "AUXPCM_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "SEC_AUXPCM_HOSTLESS Playback",

			.aif_name = "SEC_AUXPCM_DL_HL",

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 1,

			.rate_min =     8000,

			.rate_max =     16000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "SEC_AUXPCM_RX_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.capture = {

			.stream_name = "SEC_AUXPCM_HOSTLESS Capture",

			.aif_name = "SEC_AUXPCM_UL_HL",

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 1,

			.rate_min =     8000,

			.rate_max =    16000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "SEC_AUXPCM_TX_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "VOICE_STUB Playback",

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

+22 −0
Original line number Diff line number Diff line
@@ -7294,6 +7294,9 @@ static const struct snd_kcontrol_new aux_pcm_rx_port_mixer_controls[] = { 
	SOC_SINGLE_EXT("QUAT_TDM_TX_0", MSM_BACKEND_DAI_AUXPCM_RX,

	MSM_BACKEND_DAI_QUAT_TDM_TX_0, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("SEC_MI2S_TX", MSM_BACKEND_DAI_AUXPCM_RX,

	MSM_BACKEND_DAI_SECONDARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

};















static const struct snd_kcontrol_new sec_auxpcm_rx_port_mixer_controls[] = {









@@ -7306,6 +7309,9 @@ static const struct snd_kcontrol_new sec_auxpcm_rx_port_mixer_controls[] = {













	SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_SEC_AUXPCM_RX,















	MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,















	msm_routing_put_port_mixer),













	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_SEC_AUXPCM_RX,













	MSM_BACKEND_DAI_PRI_MI2S_TX, 1, 0, msm_routing_get_port_mixer,













	msm_routing_put_port_mixer),















};





























static const struct snd_kcontrol_new sbus_1_rx_port_mixer_controls[] = {










@@ -7439,6 +7445,9 @@ static const struct snd_kcontrol_new primary_mi2s_rx_port_mixer_controls[] = {













	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,















	MSM_BACKEND_DAI_SLIMBUS_0_TX, 1, 0, msm_routing_get_port_mixer,















	msm_routing_put_port_mixer),













	SOC_SINGLE_EXT("SEC_AUX_PCM_UL_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,













	MSM_BACKEND_DAI_SEC_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,













	msm_routing_put_port_mixer),















};





























static const struct snd_kcontrol_new quat_mi2s_rx_port_mixer_controls[] = {










@@ -8572,6 +8581,9 @@ static const struct snd_kcontrol_new sec_mi2s_rx_port_mixer_controls[] = {













	SOC_SINGLE_EXT("SEC_MI2S_TX", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,















	MSM_BACKEND_DAI_SECONDARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,















	msm_routing_put_port_mixer),













	SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,













	MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,













	msm_routing_put_port_mixer),















};





























static const struct snd_kcontrol_new lsm1_mixer_controls[] = {










@@ -9791,6 +9803,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {













		0, 0, 0, 0),















	SND_SOC_DAPM_AIF_OUT("AUXPCM_UL_HL", "AUXPCM_HOSTLESS Capture",















		0, 0, 0, 0),













	SND_SOC_DAPM_AIF_IN("SEC_AUXPCM_DL_HL", "SEC_AUXPCM_HOSTLESS Playback",













		0, 0, 0, 0),













	SND_SOC_DAPM_AIF_OUT("SEC_AUXPCM_UL_HL", "SEC_AUXPCM_HOSTLESS Capture",













		0, 0, 0, 0),















	SND_SOC_DAPM_AIF_OUT("MI2S_UL_HL", "MI2S_TX_HOSTLESS Capture",















		0, 0, 0, 0),















	SND_SOC_DAPM_AIF_OUT("TERT_MI2S_UL_HL",










@@ -12121,7 +12137,9 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"HFP_INT_UL_HL", "Switch", "INT_BT_SCO_TX"},















	{"AUX_PCM_RX", NULL, "AUXPCM_DL_HL"},















	{"AUX_PCM_RX", NULL, "INTHFP_DL_HL"},













	{"SEC_AUX_PCM_RX", NULL, "SEC_AUXPCM_DL_HL"},















	{"AUXPCM_UL_HL", NULL, "AUX_PCM_TX"},













	{"SEC_AUXPCM_UL_HL", NULL, "SEC_AUX_PCM_TX"},















	{"MI2S_RX", NULL, "MI2S_DL_HL"},















	{"MI2S_UL_HL", NULL, "MI2S_TX"},















	{"PCM_RX_DL_HL", "Switch", "SLIM0_DL_HL"},










@@ -12487,11 +12505,13 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"AUX_PCM_RX Port Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},















	{"AUX_PCM_RX Port Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},















	{"AUX_PCM_RX Port Mixer", "QUAT_TDM_TX_0", "QUAT_TDM_TX_0"},













	{"AUX_PCM_RX Port Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},















	{"AUX_PCM_RX", NULL, "AUX_PCM_RX Port Mixer"},





























	{"SEC_AUXPCM_RX Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},















	{"SEC_AUXPCM_RX Port Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},















	{"SEC_AUXPCM_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},













	{"SEC_AUXPCM_RX Port Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},















	{"SEC_AUX_PCM_RX", NULL, "SEC_AUXPCM_RX Port Mixer"},





























	{"Voice Stub Tx Mixer", "STUB_TX_HL", "STUB_TX"},










@@ -12592,6 +12612,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"PRI_MI2S_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},















	{"PRI_MI2S_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},















	{"PRI_MI2S_RX Port Mixer", "INTERNAL_BT_SCO_TX", "INT_BT_SCO_TX"},













	{"PRI_MI2S_RX Port Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},















	{"PRI_MI2S_RX", NULL, "PRI_MI2S_RX Port Mixer"},





























	{"SEC_MI2S_RX Port Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},









@@ -12599,6 +12620,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"SEC_MI2S_RX Port Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},















	{"SEC_MI2S_RX Port Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},















	{"SEC_MI2S_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},













	{"SEC_MI2S_RX Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},















	{"SEC_MI2S_RX", NULL, "SEC_MI2S_RX Port Mixer"},





























	{"TERT_MI2S_RX Port Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},