Merge "ASoC: msm: add afe_loopback_tx BE dai" (0815abc5) · Commits · e / devices / android_kernel_xiaomi_markw

include/sound/apr_audio-v2.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -946,6 +946,8 @@ struct adm_cmd_connect_afe_port_v5 {
		#define RT_PROXY_PORT_001_RX 0x2000
		#define RT_PROXY_PORT_001_TX 0x2001

		#define AFE_LOOPBACK_TX 0x6001

		#define AFE_PORT_INVALID 0xFFFF
		#define SLIMBUS_INVALID AFE_PORT_INVALID

include/sound/q6afe-v2.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@ enum {
		IDX_AFE_PORT_ID_QUATERNARY_TDM_TX_6,
		IDX_AFE_PORT_ID_QUATERNARY_TDM_RX_7,
		IDX_AFE_PORT_ID_QUATERNARY_TDM_TX_7,
		IDX_AFE_LOOPBACK_TX,
		AFE_MAX_PORTS
		};

sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c

+25 −0

Original line number	Diff line number	Diff line
		@@ -2038,6 +2038,25 @@ static struct snd_soc_dai_driver msm_dai_q6_afe_tx_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_48000 \| SNDRV_PCM_RATE_8000 \|
		SNDRV_PCM_RATE_16000,
		.formats = SNDRV_PCM_FMTBIT_S16_LE,
		.channels_min = 1,
		.channels_max = 8,
		.rate_min = 8000,
		.rate_max = 48000,
		},
		.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_bt_sco_rx_dai = {
		.playback = {
		.stream_name = "Internal BT-SCO Playback",
		@@ -3746,6 +3765,12 @@ register_slim_capture:
		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);

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

+36 −0

Original line number	Diff line number	Diff line
		@@ -446,6 +446,7 @@ struct msm_pcm_routing_bdai_data msm_bedais[MSM_BACKEND_DAI_MAX] = {
		LPASS_BE_QUAT_TDM_TX_7},
		{ INT_BT_A2DP_RX, 0, 0, 0, 0, 0, 0, {0}, LPASS_BE_INT_BT_A2DP_RX},
		{ SLIMBUS_2_TX, 0, 0, 0, 0, 0, 0, {0}, LPASS_BE_SLIMBUS_2_TX},
		{ AFE_LOOPBACK_TX, 0, 0, 0, 0, 0, 0, {0}, LPASS_BE_AFE_LOOPBACK_TX},
		};

		/* Track ASM playback & capture sessions of DAI
		@@ -5480,6 +5481,9 @@ static const struct snd_kcontrol_new mmul1_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_TDM_TX_3", MSM_BACKEND_DAI_QUAT_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("AFE_LOOPBACK_TX", 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[] = {
		@@ -5558,6 +5562,9 @@ static const struct snd_kcontrol_new mmul2_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_TDM_TX_3", MSM_BACKEND_DAI_QUAT_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("AFE_LOOPBACK_TX", 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[] = {
		@@ -5639,6 +5646,9 @@ static const struct snd_kcontrol_new mmul3_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_TDM_TX_3", MSM_BACKEND_DAI_QUAT_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("AFE_LOOPBACK_TX", 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[] = {
		@@ -5723,6 +5733,9 @@ static const struct snd_kcontrol_new mmul4_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("AFE_LOOPBACK_TX", 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[] = {
		@@ -5810,6 +5823,9 @@ static const struct snd_kcontrol_new mmul5_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("AFE_LOOPBACK_TX", 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[] = {
		@@ -5888,6 +5904,9 @@ static const struct snd_kcontrol_new mmul6_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_TDM_TX_3", MSM_BACKEND_DAI_QUAT_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("AFE_LOOPBACK_TX", 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[] = {
		@@ -5975,6 +5994,9 @@ static const struct snd_kcontrol_new mmul8_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_TDM_TX_3", MSM_BACKEND_DAI_QUAT_TDM_TX_3,
		MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("AFE_LOOPBACK_TX", 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 mmul9_mixer_controls[] = {
		@@ -6056,6 +6078,9 @@ static const struct snd_kcontrol_new mmul9_mixer_controls[] = {
		SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_TX,
		MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("AFE_LOOPBACK_TX", 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 mmul17_mixer_controls[] = {
		@@ -10201,6 +10226,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),

		/* Switch Definitions */
		SND_SOC_DAPM_SWITCH("SLIMBUS_DL_HL", SND_SOC_NOPM, 0, 0,
		@@ -11281,6 +11308,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"},

		{"MultiMedia2 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
		{"MultiMedia2 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
		@@ -11298,6 +11326,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"},

		{"MultiMedia3 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
		{"MultiMedia3 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
		@@ -11315,6 +11344,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"},

		{"MultiMedia4 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
		{"MultiMedia4 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
		@@ -11332,6 +11362,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"},

		{"MultiMedia5 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
		{"MultiMedia5 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
		@@ -11349,6 +11380,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"},

		{"MultiMedia6 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
		{"MultiMedia6 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
		@@ -11366,6 +11398,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"},

		{"MultiMedia8 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
		{"MultiMedia8 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
		@@ -11383,6 +11416,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"},

		{"MultiMedia9 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
		{"MultiMedia9 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
		@@ -11401,6 +11435,7 @@ 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"},
		{"MultiMedia9 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},
		{"MultiMedia9 Mixer", "AFE_LOOPBACK_TX", "AFE_LOOPBACK_TX"},

		{"MultiMedia20 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},
		{"MultiMedia20 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},
		@@ -12664,6 +12699,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"},
		};

		static int msm_pcm_routing_hw_params(struct snd_pcm_substream *substream,

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,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"

		/* For multimedia front-ends, asm session is allocated dynamically.
		* Hence, asm session/multimedia front-end mapping has to be maintained.
		@@ -303,6 +304,7 @@ enum {
		MSM_BACKEND_DAI_QUAT_TDM_TX_7,
		MSM_BACKEND_DAI_INT_BT_A2DP_RX,
		MSM_BACKEND_DAI_SLIMBUS_2_TX,
		MSM_BACKEND_DAI_AFE_LOOPBACK_TX,
		MSM_BACKEND_DAI_MAX,
		};