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

Commit 1241efa8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: Add AUX PCM routing controls for BT SCO"

parents 6b3e34cc 994a4e91

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

+20 −8
Original line number Diff line number Diff line
@@ -2442,13 +2442,16 @@ static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = { 
	msm_routing_put_port_mixer),

};



static const struct snd_kcontrol_new auxpcm_rx_port_mixer_controls[] = {

static const struct snd_kcontrol_new aux_pcm_rx_port_mixer_controls[] = {

	SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_RX,

	MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_AUXPCM_RX,

	MSM_BACKEND_DAI_SLIMBUS_0_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("SLIM_1_TX", MSM_BACKEND_DAI_AUXPCM_RX,

	MSM_BACKEND_DAI_SLIMBUS_1_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("SEC_AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_RX,

	MSM_BACKEND_DAI_SEC_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),
@@ -2473,6 +2476,9 @@ static const struct snd_kcontrol_new sbus_1_rx_port_mixer_controls[] = { 
	SOC_SINGLE_EXT("AFE_PCM_TX", MSM_BACKEND_DAI_SLIMBUS_1_RX,

	MSM_BACKEND_DAI_AFE_PCM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_SLIMBUS_1_RX,

	MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

};



static const struct snd_kcontrol_new sbus_3_rx_port_mixer_controls[] = {
@@ -2485,6 +2491,9 @@ static const struct snd_kcontrol_new sbus_3_rx_port_mixer_controls[] = { 
	SOC_SINGLE_EXT("AFE_PCM_RX", MSM_BACKEND_DAI_SLIMBUS_3_RX,

	MSM_BACKEND_DAI_AFE_PCM_RX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("AUX_PCM_RX", MSM_BACKEND_DAI_SLIMBUS_3_RX,

	MSM_BACKEND_DAI_AUXPCM_RX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("SLIM_0_RX", MSM_BACKEND_DAI_SLIMBUS_3_RX,

	MSM_BACKEND_DAI_SLIMBUS_0_RX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),
@@ -3375,9 +3384,9 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
	SND_SOC_DAPM_MIXER("SLIMBUS_0_RX Port Mixer",

	SND_SOC_NOPM, 0, 0, sbus_0_rx_port_mixer_controls,

	ARRAY_SIZE(sbus_0_rx_port_mixer_controls)),

	SND_SOC_DAPM_MIXER("AUXPCM_RX Port Mixer",

	SND_SOC_NOPM, 0, 0, auxpcm_rx_port_mixer_controls,

	ARRAY_SIZE(auxpcm_rx_port_mixer_controls)),

	SND_SOC_DAPM_MIXER("AUX_PCM_RX Port Mixer",

	SND_SOC_NOPM, 0, 0, aux_pcm_rx_port_mixer_controls,

	ARRAY_SIZE(aux_pcm_rx_port_mixer_controls)),

	SND_SOC_DAPM_MIXER("SEC_AUXPCM_RX Port Mixer",

	SND_SOC_NOPM, 0, 0, sec_auxpcm_rx_port_mixer_controls,

	ARRAY_SIZE(sec_auxpcm_rx_port_mixer_controls)),
@@ -3792,10 +3801,11 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"AFE_PCM_RX Port Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},

	{"PCM_RX", NULL, "AFE_PCM_RX Port Mixer"},



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

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

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

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

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

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

	{"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", 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"},
@@ -3825,6 +3835,7 @@ static const struct snd_soc_dapm_route intercon[] = { 


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

	{"SLIMBUS_1_RX Port Mixer", "AFE_PCM_TX", "PCM_TX"},

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

	{"SLIMBUS_1_RX", NULL, "SLIMBUS_1_RX Port Mixer"},

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

	{"INTERNAL_BT_SCO_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
@@ -3832,6 +3843,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"SLIMBUS_3_RX Port Mixer", "INTERNAL_BT_SCO_RX", "INT_BT_SCO_RX"},

	{"SLIMBUS_3_RX Port Mixer", "MI2S_TX", "MI2S_TX"},

	{"SLIMBUS_3_RX Port Mixer", "AFE_PCM_RX", "PCM_RX"},

	{"SLIMBUS_3_RX Port Mixer", "AUX_PCM_RX", "AUX_PCM_RX"},

	{"SLIMBUS_3_RX Port Mixer", "SLIM_0_RX", "SLIMBUS_0_RX"},

	{"SLIMBUS_3_RX", NULL, "SLIMBUS_3_RX Port Mixer"},