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

Commit 9a00990f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: bolero: Fix AMIC TX pop issue on Bolero 2.0"

parents 8f873b51 ac3440b0

asoc/codecs/bolero/tx-macro.c

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