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

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

Merge "asoc: routing: add support for echo reference on PRI_TDM_RX_1"

parents 798cbf8f 1a044716

asoc/msm-pcm-routing-v2.c

+8 −1
Original line number Diff line number Diff line
@@ -3693,6 +3693,10 @@ static int msm_routing_ec_ref_rx_put(struct snd_kcontrol *kcontrol, 
		msm_route_ec_ref_rx = 23;

		ec_ref_port_id = AFE_PORT_ID_HDMI_OVER_DP_RX;

		break;

	case 24:

		msm_route_ec_ref_rx = 24;

		ec_ref_port_id = AFE_PORT_ID_PRIMARY_TDM_RX_1;

		break;

	default:

		msm_route_ec_ref_rx = 0; /* NONE */

		pr_err("%s EC ref rx %ld not valid\n",
@@ -3716,7 +3720,8 @@ static const char *const ec_ref_rx[] = { "None", "SLIM_RX", "I2S_RX", 
	"SLIM_5_RX", "SLIM_1_TX", "QUAT_TDM_TX_1",

	"QUAT_TDM_RX_0", "QUAT_TDM_RX_1", "QUAT_TDM_RX_2", "SLIM_6_RX",

	"TERT_MI2S_RX", "QUAT_MI2S_RX", "TERT_TDM_TX_0", "USB_AUDIO_RX",

	"INT0_MI2S_RX", "INT4_MI2S_RX", "INT3_MI2S_TX", "DISPLAY_PORT"};

	"INT0_MI2S_RX", "INT4_MI2S_RX", "INT3_MI2S_TX", "DISPLAY_PORT",

	"PRI_TDM_RX_1"};









static const struct soc_enum msm_route_ec_ref_rx_enum[] = {









	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(ec_ref_rx), ec_ref_rx),








@@ -15670,6 +15675,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"AUDIO_REF_EC_UL1 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"AUDIO_REF_EC_UL1 MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},









	{"AUDIO_REF_EC_UL1 MUX", "SLIM_1_TX", "SLIMBUS_1_TX"},









	{"AUDIO_REF_EC_UL1 MUX", "PRI_TDM_TX_3", "PRI_TDM_TX_3"},









	{"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"},









	{"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_RX_0", "QUAT_TDM_RX_0"},









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








@@ -15705,6 +15711,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"AUDIO_REF_EC_UL8 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},









	{"AUDIO_REF_EC_UL8 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},









	{"AUDIO_REF_EC_UL8 MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},









	{"AUDIO_REF_EC_UL8 MUX", "PRI_TDM_TX_3", "PRI_TDM_TX_3"},

















	{"AUDIO_REF_EC_UL9 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},









	{"AUDIO_REF_EC_UL9 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},