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 <mengw@codeaurora.org>
This commit is contained in:
Meng Wang 2020-11-19 08:47:40 +08:00
commit ac3440b044
2 changed files with 4 additions and 2 deletions

View file

@ -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;

View file

@ -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;