From ac3440b04475eb63ab97bb90d5fb8b8964b21bd4 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Thu, 19 Nov 2020 08:47:40 +0800 Subject: [PATCH] asoc: bolero: Fix AMIC TX pop issue on Bolero 2.0 For bolero 2.0, amic can connect on any SWR input. Update logic to check amic usecase. Change-Id: Ia6b808a1cad681906732408d271e953dde6eff6f Signed-off-by: Meng Wang --- asoc/codecs/bolero/tx-macro.c | 3 ++- asoc/codecs/bolero/va-macro.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/asoc/codecs/bolero/tx-macro.c b/asoc/codecs/bolero/tx-macro.c index e6936a441fe6..8a0cede6f361 100644 --- a/asoc/codecs/bolero/tx-macro.c +++ b/asoc/codecs/bolero/tx-macro.c @@ -495,7 +495,8 @@ static bool is_amic_enabled(struct snd_soc_component *component, int decimator) adc_mux_reg = BOLERO_CDC_TX_INP_MUX_ADC_MUX0_CFG1 + TX_MACRO_ADC_MUX_CFG_OFFSET * decimator; if (snd_soc_component_read32(component, adc_mux_reg) & SWR_MIC) { - if (tx_priv->version == BOLERO_VERSION_2_1) + if (tx_priv->version == BOLERO_VERSION_2_1 || + tx_priv->version == BOLERO_VERSION_2_0) return true; adc_reg = BOLERO_CDC_TX_INP_MUX_ADC_MUX0_CFG0 + TX_MACRO_ADC_MUX_CFG_OFFSET * decimator; diff --git a/asoc/codecs/bolero/va-macro.c b/asoc/codecs/bolero/va-macro.c index 34564add16bb..8d5d856bf0b2 100644 --- a/asoc/codecs/bolero/va-macro.c +++ b/asoc/codecs/bolero/va-macro.c @@ -842,7 +842,8 @@ static bool is_amic_enabled(struct snd_soc_component *component, int decimator) adc_mux_reg = BOLERO_CDC_VA_INP_MUX_ADC_MUX0_CFG1 + VA_MACRO_ADC_MUX_CFG_OFFSET * decimator; if (snd_soc_component_read32(component, adc_mux_reg) & SWR_MIC) { - if (va_priv->version == BOLERO_VERSION_2_1) + if (va_priv->version == BOLERO_VERSION_2_1 || + va_priv->version == BOLERO_VERSION_2_0) return true; adc_reg = BOLERO_CDC_VA_INP_MUX_ADC_MUX0_CFG0 + VA_MACRO_ADC_MUX_CFG_OFFSET * decimator;