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

Commit d47fda44 authored by Surendar Karka's avatar Surendar Karka Committed by Gerrit - the friendly Code Review server
Browse files

asoc: add support for afe_loopback_tx BE dai 



Add dai driver and routing driver changes for
afe loopback BE. This BE is used to capture
EC reference data.

Change-Id: Ia57f335bde5f8a47de0030fbf1cdb784c8821e17
Signed-off-by: default avatarSurendar Karka <skarka@codeaurora.org>
parent b9c563ff

asoc/msm-dai-q6-v2.c

+32 −2
Original line number Diff line number Diff line
@@ -3558,6 +3558,30 @@ static struct snd_soc_dai_driver msm_dai_q6_afe_rx_dai[] = { 
	},

};



static struct snd_soc_dai_driver msm_dai_q6_afe_lb_tx_dai[] = {

	{

		.capture = {

			.stream_name = "AFE Loopback Capture",

			.aif_name = "AFE_LOOPBACK_TX",

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

			 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

			 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

			 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

			 SNDRV_PCM_RATE_192000,

			.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 =     192000,

		},

		.id = AFE_LOOPBACK_TX,

		.probe = msm_dai_q6_dai_probe,

		.remove = msm_dai_q6_dai_remove,

	},

};



static struct snd_soc_dai_driver msm_dai_q6_afe_tx_dai[] = {

	{

		.capture = {
@@ -5970,6 +5994,12 @@ static int msm_dai_q6_dev_probe(struct platform_device *pdev) 
			pr_err("%s: Device not found stream name %s\n",

				__func__, stream_name);

		break;

	case AFE_LOOPBACK_TX:

		rc = snd_soc_register_component(&pdev->dev,

						&msm_dai_q6_component,

						&msm_dai_q6_afe_lb_tx_dai[0],

						1);

		break;

	case INT_BT_SCO_RX:

		rc = snd_soc_register_component(&pdev->dev,

			&msm_dai_q6_component, &msm_dai_q6_bt_sco_rx_dai, 1);

asoc/msm-pcm-routing-v2.c

+94 −1
Original line number Diff line number Diff line
@@ -642,6 +642,7 @@ struct msm_pcm_routing_bdai_data msm_bedais[MSM_BACKEND_DAI_MAX] = { 
	  LPASS_BE_SEC_SPDIF_TX},

	{ SLIMBUS_9_RX, 0, {0}, {0}, 0, 0, 0, 0, LPASS_BE_SLIMBUS_9_RX},

	{ SLIMBUS_9_TX, 0, {0}, {0}, 0, 0, 0, 0, LPASS_BE_SLIMBUS_9_TX},

	{ AFE_LOOPBACK_TX, 0, {0}, {0}, 0, 0, 0, 0, LPASS_BE_AFE_LOOPBACK_TX},

};















/* Track ASM playback & capture sessions of DAI










@@ -9563,6 +9564,10 @@ static const struct snd_kcontrol_new mmul1_mixer_controls[] = {













		MSM_BACKEND_DAI_SLIMBUS_9_TX,















		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,















		msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













		MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,













		msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul2_mixer_controls[] = {










@@ -9758,6 +9763,10 @@ static const struct snd_kcontrol_new mmul2_mixer_controls[] = {













	MSM_BACKEND_DAI_SLIMBUS_9_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul3_mixer_controls[] = {










@@ -9949,6 +9958,10 @@ static const struct snd_kcontrol_new mmul3_mixer_controls[] = {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul4_mixer_controls[] = {










@@ -10136,6 +10149,10 @@ static const struct snd_kcontrol_new mmul4_mixer_controls[] = {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul5_mixer_controls[] = {










@@ -10351,6 +10368,10 @@ static const struct snd_kcontrol_new mmul5_mixer_controls[] = {













	MSM_BACKEND_DAI_SLIMBUS_9_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul6_mixer_controls[] = {










@@ -10542,6 +10563,10 @@ static const struct snd_kcontrol_new mmul6_mixer_controls[] = {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_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[] = {










@@ -10741,6 +10766,10 @@ static const struct snd_kcontrol_new mmul8_mixer_controls[] = {













	MSM_BACKEND_DAI_SLIMBUS_9_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul16_mixer_controls[] = {










@@ -10946,6 +10975,10 @@ static const struct snd_kcontrol_new mmul16_mixer_controls[] = {













	MSM_BACKEND_DAI_SLIMBUS_9_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul9_mixer_controls[] = {










@@ -11081,6 +11114,10 @@ static const struct snd_kcontrol_new mmul9_mixer_controls[] = {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul10_mixer_controls[] = {










@@ -11250,6 +11287,10 @@ static const struct snd_kcontrol_new mmul10_mixer_controls[] = {













	MSM_BACKEND_DAI_SLIMBUS_9_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};















static const struct snd_kcontrol_new mmul17_mixer_controls[] = {















	SOC_DOUBLE_EXT("SLIM_0_TX", SND_SOC_NOPM,










@@ -11350,6 +11391,10 @@ static const struct snd_kcontrol_new mmul17_mixer_controls[] = {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul18_mixer_controls[] = {










@@ -11455,6 +11500,10 @@ static const struct snd_kcontrol_new mmul18_mixer_controls[] = {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul19_mixer_controls[] = {










@@ -11556,6 +11605,10 @@ static const struct snd_kcontrol_new mmul19_mixer_controls[] = {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	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[] = {










@@ -11711,6 +11764,10 @@ static const struct snd_kcontrol_new mmul20_mixer_controls[] = {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_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[] = {










@@ -11854,6 +11911,10 @@ static const struct snd_kcontrol_new mmul21_mixer_controls[] = {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul27_mixer_controls[] = {










@@ -11901,6 +11962,10 @@ static const struct snd_kcontrol_new mmul27_mixer_controls[] = {













	MSM_BACKEND_DAI_SLIMBUS_9_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA27, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA27, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul28_mixer_controls[] = {










@@ -12002,6 +12067,10 @@ static const struct snd_kcontrol_new mmul28_mixer_controls[] = {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new mmul29_mixer_controls[] = {










@@ -12103,6 +12172,10 @@ static const struct snd_kcontrol_new mmul29_mixer_controls[] = {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,















	msm_routing_put_audio_mixer),













	SOC_DOUBLE_EXT("AFE_LOOPBACK_TX", SND_SOC_NOPM,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,













	MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,













	msm_routing_put_audio_mixer),















};





























static const struct snd_kcontrol_new pri_rx_voice_mixer_controls[] = {










@@ -18853,7 +18926,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {













	/* In- call recording */















	SND_SOC_DAPM_AIF_OUT("SLIMBUS_6_RX", "Slimbus6 Playback", 0, 0, 0, 0),















	SND_SOC_DAPM_AIF_IN("SLIMBUS_6_TX", "Slimbus6 Capture", 0, 0, 0, 0),

























	SND_SOC_DAPM_AIF_IN("AFE_LOOPBACK_TX", "AFE Loopback Capture",













				0, 0, 0, 0),















	SND_SOC_DAPM_AIF_OUT("SLIMBUS_7_RX", "Slimbus7 Playback", 0, 0, 0, 0),















	SND_SOC_DAPM_AIF_IN("SLIMBUS_7_TX", "Slimbus7 Capture", 0, 0, 0, 0),
























@@ -20746,6 +20820,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia1 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},















	{"MultiMedia1 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},















	{"MultiMedia1 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},













	{"MultiMedia1 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},















	{"MultiMedia1 Mixer", "QUIN_TDM_TX_0", "QUIN_TDM_TX_0"},















	{"MultiMedia1 Mixer", "QUIN_TDM_TX_1", "QUIN_TDM_TX_1"},















	{"MultiMedia1 Mixer", "QUIN_TDM_TX_2", "QUIN_TDM_TX_2"},










@@ -20780,6 +20855,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia2 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},















	{"MultiMedia2 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},















	{"MultiMedia2 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},













	{"MultiMedia2 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},















	{"MultiMedia2 Mixer", "QUIN_TDM_TX_0", "QUIN_TDM_TX_0"},















	{"MultiMedia2 Mixer", "QUIN_TDM_TX_1", "QUIN_TDM_TX_1"},















	{"MultiMedia2 Mixer", "QUIN_TDM_TX_2", "QUIN_TDM_TX_2"},










@@ -20814,6 +20890,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia3 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},















	{"MultiMedia3 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},















	{"MultiMedia3 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},













	{"MultiMedia3 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},















	{"MultiMedia3 Mixer", "QUIN_TDM_TX_0", "QUIN_TDM_TX_0"},















	{"MultiMedia3 Mixer", "QUIN_TDM_TX_1", "QUIN_TDM_TX_1"},















	{"MultiMedia3 Mixer", "QUIN_TDM_TX_2", "QUIN_TDM_TX_2"},










@@ -20848,6 +20925,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia4 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},















	{"MultiMedia4 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},















	{"MultiMedia4 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},













	{"MultiMedia4 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},















	{"MultiMedia4 Mixer", "QUIN_TDM_TX_0", "QUIN_TDM_TX_0"},















	{"MultiMedia4 Mixer", "QUIN_TDM_TX_1", "QUIN_TDM_TX_1"},















	{"MultiMedia4 Mixer", "QUIN_TDM_TX_2", "QUIN_TDM_TX_2"},










@@ -20882,6 +20960,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia5 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},















	{"MultiMedia5 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},















	{"MultiMedia5 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},













	{"MultiMedia5 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},















	{"MultiMedia5 Mixer", "QUIN_TDM_TX_0", "QUIN_TDM_TX_0"},















	{"MultiMedia5 Mixer", "QUIN_TDM_TX_1", "QUIN_TDM_TX_1"},















	{"MultiMedia5 Mixer", "QUIN_TDM_TX_2", "QUIN_TDM_TX_2"},










@@ -20916,6 +20995,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia6 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},















	{"MultiMedia6 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},















	{"MultiMedia6 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},













	{"MultiMedia6 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},















	{"MultiMedia6 Mixer", "QUIN_TDM_TX_0", "QUIN_TDM_TX_0"},















	{"MultiMedia6 Mixer", "QUIN_TDM_TX_1", "QUIN_TDM_TX_1"},















	{"MultiMedia6 Mixer", "QUIN_TDM_TX_2", "QUIN_TDM_TX_2"},










@@ -20950,6 +21030,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia8 Mixer", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},















	{"MultiMedia8 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},















	{"MultiMedia8 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},













	{"MultiMedia8 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},















	{"MultiMedia8 Mixer", "QUIN_TDM_TX_0", "QUIN_TDM_TX_0"},















	{"MultiMedia8 Mixer", "QUIN_TDM_TX_1", "QUIN_TDM_TX_1"},















	{"MultiMedia8 Mixer", "QUIN_TDM_TX_2", "QUIN_TDM_TX_2"},










@@ -20993,6 +21074,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia9 Mixer", "TX_CDC_DMA_TX_5", "TX_CDC_DMA_TX_5"},















	{"MultiMedia9 Mixer", "PRI_SPDIF_TX", "PRI_SPDIF_TX"},















	{"MultiMedia9 Mixer", "SEC_SPDIF_TX", "SEC_SPDIF_TX"},













	{"MultiMedia9 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},





























	{"MultiMedia10 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},















	{"MultiMedia10 Mixer", "TERT_TDM_TX_1", "TERT_TDM_TX_1"},









@@ -21008,6 +21090,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia10 Mixer", "TX_CDC_DMA_TX_3", "TX_CDC_DMA_TX_3"},















	{"MultiMedia10 Mixer", "TX_CDC_DMA_TX_4", "TX_CDC_DMA_TX_4"},















	{"MultiMedia10 Mixer", "TX_CDC_DMA_TX_5", "TX_CDC_DMA_TX_5"},













	{"MultiMedia10 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},





























	{"MultiMedia20 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},















	{"MultiMedia20 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},










@@ -21047,6 +21130,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia20 Mixer", "TX_CDC_DMA_TX_5", "TX_CDC_DMA_TX_5"},















	{"MultiMedia20 Mixer", "PRI_SPDIF_TX", "PRI_SPDIF_TX"},















	{"MultiMedia20 Mixer", "SEC_SPDIF_TX", "SEC_SPDIF_TX"},













	{"MultiMedia20 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},





























	{"MultiMedia21 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},















	{"MultiMedia21 Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},










@@ -21083,6 +21167,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"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"},













	{"MultiMedia21 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},





























	{"MultiMedia27 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},















	{"MultiMedia27 Mixer", "SLIM_6_TX", "SLIMBUS_6_TX"},









@@ -21095,6 +21180,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia27 Mixer", "QUIN_MI2S_TX", "QUIN_MI2S_TX"},















	{"MultiMedia27 Mixer", "PRI_SPDIF_TX", "PRI_SPDIF_TX"},















	{"MultiMedia27 Mixer", "SEC_SPDIF_TX", "SEC_SPDIF_TX"},













	{"MultiMedia27 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},





























	{"MultiMedia1 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},















	{"MultiMedia2 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"},










@@ -21134,6 +21220,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia16 Mixer", "TX_CDC_DMA_TX_5", "TX_CDC_DMA_TX_5"},















	{"MultiMedia16 Mixer", "PRI_SPDIF_TX", "PRI_SPDIF_TX"},















	{"MultiMedia16 Mixer", "SEC_SPDIF_TX", "SEC_SPDIF_TX"},













	{"MultiMedia16 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},





























	{"MultiMedia17 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},















	{"MultiMedia17 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},









@@ -21141,6 +21228,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia17 Mixer", "TX_CDC_DMA_TX_3", "TX_CDC_DMA_TX_3"},















	{"MultiMedia17 Mixer", "TX_CDC_DMA_TX_4", "TX_CDC_DMA_TX_4"},















	{"MultiMedia17 Mixer", "TX_CDC_DMA_TX_5", "TX_CDC_DMA_TX_5"},













	{"MultiMedia17 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},





























	{"MultiMedia18 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},















	{"MultiMedia18 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},









@@ -21148,6 +21236,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia18 Mixer", "TX_CDC_DMA_TX_3", "TX_CDC_DMA_TX_3"},















	{"MultiMedia18 Mixer", "TX_CDC_DMA_TX_4", "TX_CDC_DMA_TX_4"},















	{"MultiMedia18 Mixer", "TX_CDC_DMA_TX_5", "TX_CDC_DMA_TX_5"},













	{"MultiMedia18 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},





























	{"MultiMedia19 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},















	{"MultiMedia19 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},









@@ -21155,6 +21244,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia19 Mixer", "TX_CDC_DMA_TX_3", "TX_CDC_DMA_TX_3"},















	{"MultiMedia19 Mixer", "TX_CDC_DMA_TX_4", "TX_CDC_DMA_TX_4"},















	{"MultiMedia19 Mixer", "TX_CDC_DMA_TX_5", "TX_CDC_DMA_TX_5"},













	{"MultiMedia19 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},





























	{"MultiMedia28 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},















	{"MultiMedia28 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},









@@ -21162,6 +21252,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia28 Mixer", "TX_CDC_DMA_TX_3", "TX_CDC_DMA_TX_3"},















	{"MultiMedia28 Mixer", "TX_CDC_DMA_TX_4", "TX_CDC_DMA_TX_4"},















	{"MultiMedia28 Mixer", "TX_CDC_DMA_TX_5", "TX_CDC_DMA_TX_5"},













	{"MultiMedia28 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},





























	{"MultiMedia29 Mixer", "TX_CDC_DMA_TX_0", "TX_CDC_DMA_TX_0"},















	{"MultiMedia29 Mixer", "TX_CDC_DMA_TX_1", "TX_CDC_DMA_TX_1"},









@@ -21169,6 +21260,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"MultiMedia29 Mixer", "TX_CDC_DMA_TX_3", "TX_CDC_DMA_TX_3"},















	{"MultiMedia29 Mixer", "TX_CDC_DMA_TX_4", "TX_CDC_DMA_TX_4"},















	{"MultiMedia29 Mixer", "TX_CDC_DMA_TX_5", "TX_CDC_DMA_TX_5"},













	{"MultiMedia29 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},





























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















	{"INTERNAL_BT_SCO_RX Audio Mixer", "MultiMedia2", "MM_DL2"},










@@ -22850,6 +22942,7 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"QUAT_TDM_TX_1", NULL, "BE_IN"},















	{"QUAT_TDM_TX_2", NULL, "BE_IN"},















	{"QUAT_TDM_TX_3", NULL, "BE_IN"},













	{"AFE_LOOPBACK_TX", NULL, "BE_IN"},















	{"QUIN_TDM_TX_0", NULL, "BE_IN"},















	{"QUIN_TDM_TX_1", NULL, "BE_IN"},















	{"QUIN_TDM_TX_2", NULL, "BE_IN"},

























asoc/msm-pcm-routing-v2.h



+2
−0




























Original line number
Diff line number
Diff line








@@ -144,6 +144,7 @@













#define LPASS_BE_QUAT_TDM_TX_6 "QUAT_TDM_TX_6"















#define LPASS_BE_QUAT_TDM_RX_7 "QUAT_TDM_RX_7"















#define LPASS_BE_QUAT_TDM_TX_7 "QUAT_TDM_TX_7"













#define LPASS_BE_AFE_LOOPBACK_TX "AFE_LOOPBACK_TX"















#define LPASS_BE_QUIN_TDM_RX_0 "QUIN_TDM_RX_0"















#define LPASS_BE_QUIN_TDM_TX_0 "QUIN_TDM_TX_0"















#define LPASS_BE_QUIN_TDM_RX_1 "QUIN_TDM_RX_1"










@@ -455,6 +456,7 @@ enum {













	MSM_BACKEND_DAI_SEC_SPDIF_TX,















	MSM_BACKEND_DAI_SLIMBUS_9_RX,















	MSM_BACKEND_DAI_SLIMBUS_9_TX,













	MSM_BACKEND_DAI_AFE_LOOPBACK_TX,















	MSM_BACKEND_DAI_MAX,















};

















































dsp/q6afe.c



+2
−0




























Original line number
Diff line number
Diff line








@@ -4584,6 +4584,8 @@ int afe_get_port_index(u16 port_id)













		return IDX_AFE_PORT_ID_RX_CODEC_DMA_RX_6;















	case AFE_PORT_ID_RX_CODEC_DMA_RX_7:















		return IDX_AFE_PORT_ID_RX_CODEC_DMA_RX_7;













	case AFE_LOOPBACK_TX:













		return IDX_AFE_LOOPBACK_TX;















	default:















		pr_err("%s: port 0x%x\n", __func__, port_id);















		return -EINVAL;

































include/dsp/apr_audio-v2.h



+1
−0




























Original line number
Diff line number
Diff line








@@ -1341,6 +1341,7 @@ struct adm_cmd_connect_afe_port_v5 {













#define INT_FM_TX 0x3005















#define RT_PROXY_PORT_001_RX	0x2000















#define RT_PROXY_PORT_001_TX	0x2001













#define AFE_LOOPBACK_TX	0x6001















#define DISPLAY_PORT_RX	0x6020































#define AFE_PORT_INVALID 0xFFFF