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

Commit 3cdf3c45 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: routing: add ec ref for sec and tert tdm"

parents 615ff0d5 a4b6bf92

asoc/msm-pcm-routing-v2.c

+13 −1
Original line number Original line Diff line number Diff line
@@ -3941,6 +3941,14 @@ static int msm_routing_ec_ref_rx_put(struct snd_kcontrol *kcontrol, 
		msm_route_ec_ref_rx = 34;

		msm_route_ec_ref_rx = 34;

		ec_ref_port_id = AFE_PORT_ID_TX_CODEC_DMA_TX_0;

		ec_ref_port_id = AFE_PORT_ID_TX_CODEC_DMA_TX_0;

		break;

		break;

	case 35:

		msm_route_ec_ref_rx = 35;

		ec_ref_port_id = AFE_PORT_ID_TERTIARY_TDM_RX_2;

		break;

	case 36:

		msm_route_ec_ref_rx = 36;

		ec_ref_port_id = AFE_PORT_ID_SECONDARY_TDM_TX;

		break;

	default:

	default:

		msm_route_ec_ref_rx = 0; /* NONE */

		msm_route_ec_ref_rx = 0; /* NONE */

		pr_err("%s EC ref rx %ld not valid\n",

		pr_err("%s EC ref rx %ld not valid\n",
@@ -3967,7 +3975,7 @@ static const char *const ec_ref_rx[] = { "None", "SLIM_RX", "I2S_RX", 
	"WSA_CDC_DMA_RX_0", "WSA_CDC_DMA_RX_1",

	"WSA_CDC_DMA_RX_0", "WSA_CDC_DMA_RX_1",

	"WSA_CDC_DMA_TX_0", "WSA_CDC_DMA_TX_1", "WSA_CDC_DMA_TX_2",

	"WSA_CDC_DMA_TX_0", "WSA_CDC_DMA_TX_1", "WSA_CDC_DMA_TX_2",

	"SLIM_7_RX", "RX_CDC_DMA_RX_0", "RX_CDC_DMA_RX_1", "RX_CDC_DMA_RX_2",

	"SLIM_7_RX", "RX_CDC_DMA_RX_0", "RX_CDC_DMA_RX_1", "RX_CDC_DMA_RX_2",

	"RX_CDC_DMA_RX_3", "TX_CDC_DMA_TX_0",

	"RX_CDC_DMA_RX_3", "TX_CDC_DMA_TX_0", "TERT_TDM_RX_2", "SEC_TDM_TX_0",

};

};

















static const struct soc_enum msm_route_ec_ref_rx_enum[] = {







static const struct soc_enum msm_route_ec_ref_rx_enum[] = {










@@ -21562,6 +21570,8 @@ static const struct snd_soc_dapm_route intercon[] = {









	{"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_RX_1", "QUAT_TDM_RX_1"},







	{"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_RX_1", "QUAT_TDM_RX_1"},











	{"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_RX_2", "QUAT_TDM_RX_2"},







	{"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_RX_2", "QUAT_TDM_RX_2"},











	{"AUDIO_REF_EC_UL1 MUX", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},







	{"AUDIO_REF_EC_UL1 MUX", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},














	{"AUDIO_REF_EC_UL1 MUX", "TERT_TDM_RX_2", "TERT_TDM_RX_2"},














	{"AUDIO_REF_EC_UL1 MUX", "SEC_TDM_TX_0", "SEC_TDM_TX_0"},



























	{"AUDIO_REF_EC_UL2 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},







	{"AUDIO_REF_EC_UL2 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},











	{"AUDIO_REF_EC_UL2 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},







	{"AUDIO_REF_EC_UL2 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},










@@ -21608,6 +21618,8 @@ static const struct snd_soc_dapm_route intercon[] = {









	{"AUDIO_REF_EC_UL10 MUX", "QUAT_TDM_RX_1", "QUAT_TDM_RX_1"},







	{"AUDIO_REF_EC_UL10 MUX", "QUAT_TDM_RX_1", "QUAT_TDM_RX_1"},











	{"AUDIO_REF_EC_UL10 MUX", "QUAT_TDM_RX_2", "QUAT_TDM_RX_2"},







	{"AUDIO_REF_EC_UL10 MUX", "QUAT_TDM_RX_2", "QUAT_TDM_RX_2"},











	{"AUDIO_REF_EC_UL10 MUX", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},







	{"AUDIO_REF_EC_UL10 MUX", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},














	{"AUDIO_REF_EC_UL10 MUX", "TERT_TDM_RX_2", "TERT_TDM_RX_2"},














	{"AUDIO_REF_EC_UL10 MUX", "SEC_TDM_TX_0", "SEC_TDM_TX_0"},



























	{"AUDIO_REF_EC_UL16 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},







	{"AUDIO_REF_EC_UL16 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},











	{"AUDIO_REF_EC_UL16 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},







	{"AUDIO_REF_EC_UL16 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},