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

Commit 8f4572a9 authored by Vimal Puthanveed's avatar Vimal Puthanveed Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: Add routing for HFP using AFE and ASM Loopback 



HFP hostless driver is used to loopback BT data into
SLIM_0_RX. And asm loopback MM6 is used for looping
data from mic to BT so that pre_proc effects can be
added.

Change-Id: I1176d475f7f5cc9306705855acd3c0172f0d7b21
Signed-off-by: default avatarVimal Puthanveed <vimalp@codeaurora.org>
parent 58d06df7

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

+24 −0
Original line number Diff line number Diff line
@@ -469,6 +469,30 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.name = "INT_FM_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "INT_HFP_BT Hostless Playback",

			.aif_name = "INTHFP_DL_HL",

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 2,

			.rate_min =     8000,

			.rate_max =     16000,

		},

		.capture = {

			.stream_name = "INT_HFP_BT Hostless Capture",

			.aif_name = "INTHFP_UL_HL",

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 2,

			.rate_min =     8000,

			.rate_max =     16000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "INT_HFP_BT_HOSTLESS",

	},

	{

		.playback = {

			.stream_name = "AFE Playback",

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

+11 −0
Original line number Diff line number Diff line
@@ -2159,6 +2159,9 @@ static const struct snd_kcontrol_new mmul6_mixer_controls[] = { 
	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_INT_FM_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

};



static const struct snd_kcontrol_new mmul8_mixer_controls[] = {
@@ -3332,6 +3335,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_OUT("INTFM_UL_HL", "INT_FM_HOSTLESS Capture",

		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("INTHFP_DL_HL", "INT_HFP_BT_HOSTLESS Playback",

		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_OUT("INTHFP_UL_HL", "INT_HFP_BT_HOSTLESS Capture",

		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("HDMI_DL_HL", "HDMI_HOSTLESS Playback", 0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("SEC_I2S_DL_HL", "SEC_I2S_RX_HOSTLESS Playback",

		0, 0, 0, 0),
@@ -3750,6 +3757,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia2 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia1 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},

	{"MultiMedia1 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"MultiMedia6 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},



	{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia1", "MM_DL1"},

	{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia2", "MM_DL2"},
@@ -3760,6 +3768,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia7", "MM_DL7"},

	{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia8", "MM_DL8"},

	{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia9", "MM_DL9"},

	{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia6", "MM_UL6"},

	{"INT_BT_SCO_RX", NULL, "INTERNAL_BT_SCO_RX Audio Mixer"},



	{"INTERNAL_FM_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
@@ -3994,6 +4003,8 @@ static const struct snd_soc_dapm_route intercon[] = { 


	{"INT_FM_RX", NULL, "INTFM_DL_HL"},

	{"INTFM_UL_HL", NULL, "INT_FM_TX"},

	{"INTHFP_UL_HL", NULL, "INT_BT_SCO_TX"},

	{"INT_BT_SCO_RX", NULL, "MM_DL6"},

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

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

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