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

Commit 6540f567 authored by Vatsal Bucha's avatar Vatsal Bucha
Browse files

ASoC: msm: qdsp6v2: add support for Slimbus2 TX BE 



Slimbus to I2S bridge uses Slimbus 2 TX and SLIMBUS 4 RX
as backends for capture and playback respectively. Hence
add support for Slimbus2 TX backend.

CRs-Fixed: 2039443
Change-Id: I3b79fc64647c6be48ff9ea14124a019e85e01c3b
Signed-off-by: default avatarVatsal Bucha <vbucha@codeaurora.org>
parent f5086aa2

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

+49 −0
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ struct msm_pcm_routing_bdai_data msm_bedais[MSM_BACKEND_DAI_MAX] = { 
	{ AFE_PORT_ID_QUATERNARY_TDM_TX_7, 0, 0, 0, 0, 0, 0, {0},

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

};



/* Track ASM playback & capture sessions of DAI
@@ -4614,6 +4615,9 @@ static const struct snd_kcontrol_new mmul1_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,

		msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,

		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,

		msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_TX,

		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,

		msm_routing_put_audio_mixer),
@@ -4716,6 +4720,9 @@ static const struct snd_kcontrol_new mmul2_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("QUIN_MI2S_TX", MSM_BACKEND_DAI_QUINARY_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -4773,6 +4780,9 @@ static const struct snd_kcontrol_new mmul3_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_INT_FM_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -4851,6 +4861,9 @@ static const struct snd_kcontrol_new mmul4_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -4932,6 +4945,9 @@ static const struct snd_kcontrol_new mmul5_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_INT_FM_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -5019,6 +5035,9 @@ static const struct snd_kcontrol_new mmul6_mixer_controls[] = { 
	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),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -5091,6 +5110,9 @@ static const struct snd_kcontrol_new mmul8_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -5175,6 +5197,9 @@ static const struct snd_kcontrol_new mmul9_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -5253,6 +5278,9 @@ static const struct snd_kcontrol_new mmul17_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -5280,6 +5308,9 @@ static const struct snd_kcontrol_new mmul18_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -5307,6 +5338,9 @@ static const struct snd_kcontrol_new mmul19_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_2_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),
@@ -6259,6 +6293,9 @@ static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_1_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX,

	MSM_BACKEND_DAI_SLIMBUS_1_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("SLIM_2_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX,

	MSM_BACKEND_DAI_SLIMBUS_2_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX,

	MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),
@@ -9069,6 +9106,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
	SND_SOC_DAPM_AIF_IN("SEC_MI2S_TX", "Secondary MI2S Capture",

			    0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("SLIMBUS_0_TX", "Slimbus Capture", 0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("SLIMBUS_2_TX", "Slimbus2 Capture", 0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("QUIN_MI2S_TX", "Quinary MI2S Capture",

						0, 0, 0, 0),

	SND_SOC_DAPM_AIF_OUT("INT_BT_SCO_RX", "Internal BT-SCO Playback",
@@ -9825,6 +9863,11 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia18 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia19 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia8 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia4 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},

	{"MultiMedia17 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},

	{"MultiMedia18 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},

	{"MultiMedia19 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},

	{"MultiMedia8 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},

	{"MultiMedia2 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"MultiMedia4 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"MultiMedia17 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},
@@ -9833,6 +9876,8 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia8 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"MultiMedia3 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia5 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia3 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},

	{"MultiMedia5 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},

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

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

	{"MI2S_RX Audio Mixer", "MultiMedia3", "MM_DL3"},
@@ -10260,6 +10305,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia1 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"MultiMedia2 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"MultiMedia1 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia1 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},

	{"MultiMedia1 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},

	{"MultiMedia3 Mixer", "AUX_PCM_TX", "AUX_PCM_TX"},

	{"MultiMedia5 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},
@@ -10267,10 +10313,12 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia3 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},

	{"MultiMedia5 Mixer", "SEC_AUX_PCM_TX", "SEC_AUX_PCM_TX"},

	{"MultiMedia2 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia2 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},

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

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

	{"MultiMedia2 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},

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

	{"MultiMedia6 Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},

	{"MultiMedia6 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"MultiMedia3 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"MultiMedia5 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
@@ -11595,6 +11643,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"SENARY_MI2S_TX", NULL, "BE_IN" },

	{"SLIMBUS_0_TX", NULL, "BE_IN" },

	{"SLIMBUS_1_TX", NULL, "BE_IN" },

	{"SLIMBUS_2_TX", NULL, "BE_IN" },

	{"SLIMBUS_3_TX", NULL, "BE_IN" },

	{"SLIMBUS_4_TX", NULL, "BE_IN" },

	{"SLIMBUS_5_TX", NULL, "BE_IN" },

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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define LPASS_BE_PRI_I2S_TX "PRIMARY_I2S_TX"

#define LPASS_BE_SLIMBUS_0_RX "SLIMBUS_0_RX"

#define LPASS_BE_SLIMBUS_0_TX "SLIMBUS_0_TX"

#define LPASS_BE_SLIMBUS_2_TX "SLIMBUS_2_TX"

#define LPASS_BE_HDMI "HDMI"

#define LPASS_BE_INT_BT_SCO_RX "INT_BT_SCO_RX"

#define LPASS_BE_INT_BT_SCO_TX "INT_BT_SCO_TX"
@@ -299,6 +300,7 @@ enum { 
	MSM_BACKEND_DAI_QUAT_TDM_RX_7,

	MSM_BACKEND_DAI_QUAT_TDM_TX_7,

	MSM_BACKEND_DAI_INT_BT_A2DP_RX,

	MSM_BACKEND_DAI_SLIMBUS_2_TX,

	MSM_BACKEND_DAI_MAX,

};