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

Commit ac3440b0 authored by Meng Wang's avatar Meng Wang
Browse files

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: default avatarMeng Wang <mengw@codeaurora.org>
parent dec796e3

asoc/codecs/bolero/tx-macro.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

asoc/codecs/bolero/va-macro.c

+2 −1
Original line number Diff line number Diff line
@@ -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;