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

Commit 29a138da authored by Vidyakumar Athota's avatar Vidyakumar Athota
Browse files

ASoC: msm: Add mixer controls for Speaker protection 



During voice call MDM sends audio to codec directly but
when speaker protection feature enabled, audio goes to codec
through APQ so add mixer controls to enable this path

Change-Id: I70538ab03317307e7892b8b85a21a8271a9b2223
Signed-off-by: default avatarVidyakumar Athota <vathota@codeaurora.org>
parent 0cabfa0f

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

+8 −0
Original line number Diff line number Diff line
@@ -2425,6 +2425,9 @@ static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = { 
	SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_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_SLIMBUS_0_RX,

	MSM_BACKEND_DAI_SLIMBUS_1_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),
@@ -2482,6 +2485,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("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),

};

static const struct snd_kcontrol_new bt_sco_rx_port_mixer_controls[] = {

	SOC_SINGLE_EXT("SLIM_1_TX", MSM_BACKEND_DAI_INT_BT_SCO_RX,
@@ -3776,6 +3782,7 @@ static const struct snd_soc_dapm_route intercon[] = { 


	{"SLIMBUS_0_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},

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

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

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

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

	{"SLIMBUS_0_RX Port Mixer", "MI2S_TX", "MI2S_TX"},
@@ -3825,6 +3832,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", "SLIM_0_RX", "SLIMBUS_0_RX"},

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

sound/soc/msm/qdsp6v2/q6audio-v2.c

+6 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ int q6audio_get_port_index(u16 port_id) 
	case SLIMBUS_1_TX: return IDX_SLIMBUS_1_TX;

	case SLIMBUS_2_RX: return IDX_SLIMBUS_2_RX;

	case SLIMBUS_2_TX: return IDX_SLIMBUS_2_TX;

	case SLIMBUS_3_RX: return IDX_SLIMBUS_3_RX;

	case SLIMBUS_3_TX: return IDX_SLIMBUS_3_TX;

	case SLIMBUS_4_TX: return IDX_SLIMBUS_4_TX;

	case SLIMBUS_5_TX: return IDX_SLIMBUS_5_TX;

	case INT_BT_SCO_RX: return IDX_INT_BT_SCO_RX;
@@ -111,6 +113,8 @@ int q6audio_get_port_id(u16 port_id) 
	case SLIMBUS_1_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_1_TX;

	case SLIMBUS_2_RX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_2_RX;

	case SLIMBUS_2_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_2_TX;

	case SLIMBUS_3_RX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_3_RX;

	case SLIMBUS_3_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_3_TX;

	case SLIMBUS_4_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_4_TX;

	case SLIMBUS_5_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_5_TX;

	case INT_BT_SCO_RX: return AFE_PORT_ID_INTERNAL_BT_SCO_RX;
@@ -222,6 +226,8 @@ int q6audio_validate_port(u16 port_id) 
	case SLIMBUS_1_TX:

	case SLIMBUS_2_RX:

	case SLIMBUS_2_TX:

	case SLIMBUS_3_RX:

	case SLIMBUS_3_TX:

	case SLIMBUS_4_TX:

	case SLIMBUS_5_TX:

	case INT_BT_SCO_RX: