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

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

Merge "ASoC: wcd937x: Add check for ULP irrespective of the Class"

parents 61d08bd0 2812ff7a

asoc/codecs/wcd937x/wcd937x.c

+8 −4
Original line number Diff line number Diff line
@@ -505,7 +505,8 @@ static int wcd937x_codec_hphl_dac_event(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_POST_PMU:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   hph_mode == CLS_H_ULP)

		   ((snd_soc_component_read32(component,

			WCD937X_ANA_HPH) & 0x0C) == 0x0C))

			snd_soc_component_update_bits(component,

			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x90);

		if (hph_mode == CLS_AB_HIFI || hph_mode == CLS_H_HIFI)
@@ -551,7 +552,8 @@ static int wcd937x_codec_hphl_dac_event(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_POST_PMD:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   hph_mode == CLS_H_ULP)

		   ((snd_soc_component_read32(component,

			WCD937X_ANA_HPH) & 0x0C) == 0x0C))

			snd_soc_component_update_bits(component,

			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x80);

		snd_soc_component_update_bits(component,
@@ -589,7 +591,8 @@ static int wcd937x_codec_hphr_dac_event(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_POST_PMU:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   hph_mode == CLS_H_ULP)

		   ((snd_soc_component_read32(component,

			WCD937X_ANA_HPH) & 0x0C) == 0x0C))

			snd_soc_component_update_bits(component,

			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x90);

		if (hph_mode == CLS_AB_HIFI || hph_mode == CLS_H_HIFI)
@@ -635,7 +638,8 @@ static int wcd937x_codec_hphr_dac_event(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_POST_PMD:

		if ((snd_soc_component_read32(component,

		   WCD937X_DIGITAL_EFUSE_REG_16) == 0x02) &&

		   hph_mode == CLS_H_ULP)

		   ((snd_soc_component_read32(component,

			WCD937X_ANA_HPH) & 0x0C) == 0x0C))

			snd_soc_component_update_bits(component,

			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x80);

		snd_soc_component_update_bits(component,