Merge "asoc: msm: Add primary tdm tx line in echo reference"

This commit is contained in:
qctecmdr 2019-09-18 04:04:37 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4710d04f7b
2 changed files with 7 additions and 1 deletions

View file

@ -5682,6 +5682,9 @@ static int msm_routing_ext_ec_put(struct snd_kcontrol *kcontrol,
case EXT_EC_REF_SLIM_1_TX:
ext_ec_ref_port_id = SLIMBUS_1_TX;
break;
case EXT_EC_REF_PRI_TDM_TX:
ext_ec_ref_port_id = AFE_PORT_ID_PRIMARY_TDM_TX;
break;
case EXT_EC_REF_SEC_TDM_TX:
ext_ec_ref_port_id = AFE_PORT_ID_SECONDARY_TDM_TX;
break;
@ -5709,7 +5712,8 @@ static int msm_routing_ext_ec_put(struct snd_kcontrol *kcontrol,
static const char * const ext_ec_ref_rx[] = {"NONE", "PRI_MI2S_TX",
"SEC_MI2S_TX", "TERT_MI2S_TX",
"QUAT_MI2S_TX", "QUIN_MI2S_TX",
"SLIM_1_TX", "SEC_TDM_TX"};
"SLIM_1_TX", "PRI_TDM_TX",
"SEC_TDM_TX"};
static const struct soc_enum msm_route_ext_ec_ref_rx_enum[] = {
SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(ext_ec_ref_rx), ext_ec_ref_rx),
@ -26709,6 +26713,7 @@ static const struct snd_soc_dapm_route intercon[] = {
{"VOC_EXT_EC MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},
{"VOC_EXT_EC MUX", "QUIN_MI2S_TX", "QUIN_MI2S_TX"},
{"VOC_EXT_EC MUX", "SLIM_1_TX", "SLIMBUS_1_TX"},
{"VOC_EXT_EC MUX", "PRI_TDM_TX", "PRI_TDM_TX_0"},
{"VOC_EXT_EC MUX", "SEC_TDM_TX", "SEC_TDM_TX_0"},
{"VOIP_UL", NULL, "VOC_EXT_EC MUX"},
{"VOICEMMODE1_UL", NULL, "VOC_EXT_EC MUX"},

View file

@ -516,6 +516,7 @@ enum {
EXT_EC_REF_QUAT_MI2S_TX,
EXT_EC_REF_QUIN_MI2S_TX,
EXT_EC_REF_SLIM_1_TX,
EXT_EC_REF_PRI_TDM_TX,
EXT_EC_REF_SEC_TDM_TX,
};