From f1e691551d48ef54fe48a3d1c93b9f46c1642e33 Mon Sep 17 00:00:00 2001 From: Kunlei Zhang Date: Wed, 26 Feb 2020 15:41:31 +0800 Subject: [PATCH] ASoC: add external echo ref support for SENARY MI2S TX Add SENARY_MI2S_TX to external echo reference. It can be used for Audio/VoiP/Voice external EC reference. Change-Id: If5b61f9761607652a3e52e44344b4969821fce95 Signed-off-by: Kunlei Zhang --- asoc/msm-pcm-routing-v2.c | 6 ++++++ asoc/msm-pcm-routing-v2.h | 1 + 2 files changed, 7 insertions(+) diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c index 458229899c4b..5afad35f273b 100755 --- a/asoc/msm-pcm-routing-v2.c +++ b/asoc/msm-pcm-routing-v2.c @@ -6020,6 +6020,9 @@ static int msm_routing_ext_ec_put(struct snd_kcontrol *kcontrol, case EXT_EC_REF_SEC_TDM_TX: ext_ec_ref_port_id = AFE_PORT_ID_SECONDARY_TDM_TX; break; + case EXT_EC_REF_SENARY_MI2S_TX: + ext_ec_ref_port_id = AFE_PORT_ID_SENARY_MI2S_TX; + break; case EXT_EC_REF_NONE: default: ext_ec_ref_port_id = AFE_PORT_INVALID; @@ -30314,11 +30317,13 @@ static const struct snd_soc_dapm_route intercon_mi2s[] = { {"VOC_EXT_EC MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"}, {"VOC_EXT_EC MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"}, {"VOC_EXT_EC MUX", "QUIN_MI2S_TX", "QUIN_MI2S_TX"}, + {"VOC_EXT_EC MUX", "SENARY_MI2S_TX", "SENARY_MI2S_TX"}, {"AUDIO_REF_EC_UL1 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"}, {"AUDIO_REF_EC_UL1 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"}, {"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", "SENARY_MI2S_TX", "SENARY_MI2S_TX"}, {"AUDIO_REF_EC_UL2 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"}, {"AUDIO_REF_EC_UL2 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"}, @@ -30359,6 +30364,7 @@ static const struct snd_soc_dapm_route intercon_mi2s[] = { {"AUDIO_REF_EC_UL10 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"}, {"AUDIO_REF_EC_UL10 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"}, {"AUDIO_REF_EC_UL10 MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"}, + {"AUDIO_REF_EC_UL10 MUX", "SENARY_MI2S_TX", "SENARY_MI2S_TX"}, {"AUDIO_REF_EC_UL16 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"}, {"AUDIO_REF_EC_UL16 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"}, diff --git a/asoc/msm-pcm-routing-v2.h b/asoc/msm-pcm-routing-v2.h index fb2310466905..efed7f05351b 100644 --- a/asoc/msm-pcm-routing-v2.h +++ b/asoc/msm-pcm-routing-v2.h @@ -534,6 +534,7 @@ enum { EXT_EC_REF_SLIM_1_TX, EXT_EC_REF_PRI_TDM_TX, EXT_EC_REF_SEC_TDM_TX, + EXT_EC_REF_SENARY_MI2S_TX, }; #define INVALID_SESSION -1