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

Commit 74bdcb63 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge deab6661 on remote branch

Change-Id: I45b6e9ab6a48d99ad6fe339aef2b83f58a103c02
parents a99182ff deab6661
Loading
Loading
Loading
Loading
+21 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int wcd937x_init_reg(struct snd_soc_component *component)
		snd_soc_component_update_bits(component,
				WCD937X_BIAS_VBG_FINE_ADJ, 0xF0, 0xB0);
		snd_soc_component_update_bits(component,
				WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x90);
				WCD937X_HPH_NEW_INT_RDAC_GAIN_CTL , 0xF0, 0x50);
	}
	return 0;
}
@@ -458,6 +458,11 @@ static int wcd937x_codec_hphl_dac_event(struct snd_soc_dapm_widget *w,
		set_bit(HPH_COMP_DELAY, &wcd937x->status_mask);
		break;
	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_update_bits(component,
			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x90);
		if (hph_mode == CLS_AB_HIFI || hph_mode == CLS_H_HIFI)
			snd_soc_component_update_bits(component,
				WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_L,
@@ -499,6 +504,11 @@ static int wcd937x_codec_hphl_dac_event(struct snd_soc_dapm_widget *w,
				WCD937X_HPH_NEW_INT_HPH_TIMER1, 0x02, 0x00);
		break;
	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_update_bits(component,
			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x80);
		snd_soc_component_update_bits(component,
			WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_L,
			0x0F, 0x01);
@@ -532,6 +542,11 @@ static int wcd937x_codec_hphr_dac_event(struct snd_soc_dapm_widget *w,
		set_bit(HPH_COMP_DELAY, &wcd937x->status_mask);
		break;
	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_update_bits(component,
			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x90);
		if (hph_mode == CLS_AB_HIFI || hph_mode == CLS_H_HIFI)
			snd_soc_component_update_bits(component,
				WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_R,
@@ -573,6 +588,11 @@ static int wcd937x_codec_hphr_dac_event(struct snd_soc_dapm_widget *w,
				WCD937X_HPH_NEW_INT_HPH_TIMER1, 0x02, 0x00);
		break;
	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_update_bits(component,
			WCD937X_RX_BIAS_HPH_LOWPOWER, 0xF0, 0x80);
		snd_soc_component_update_bits(component,
			WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_R,
			0x0F, 0x01);