Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus (f6938bb3) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/codecs/sgtl5000.c

+14 −4

Original line number	Diff line number	Diff line
		@@ -153,6 +153,8 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w,
		static int power_vag_event(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event)
		{
		const u32 mask = SGTL5000_DAC_POWERUP \| SGTL5000_ADC_POWERUP;

		switch (event) {
		case SND_SOC_DAPM_POST_PMU:
		snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER,
		@@ -160,9 +162,17 @@ static int power_vag_event(struct snd_soc_dapm_widget *w,
		break;

		case SND_SOC_DAPM_PRE_PMD:
		/*
		* Don't clear VAG_POWERUP, when both DAC and ADC are
		* operational to prevent inadvertently starving the
		* other one of them.
		*/
		if ((snd_soc_read(w->codec, SGTL5000_CHIP_ANA_POWER) &
		mask) != mask) {
		snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER,
		SGTL5000_VAG_POWERUP, 0);
		msleep(400);
		}
		break;
		default:
		break;
		@@ -388,7 +398,7 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = {
		SOC_DOUBLE("Capture Volume", SGTL5000_CHIP_ANA_ADC_CTRL, 0, 4, 0xf, 0),
		SOC_SINGLE_TLV("Capture Attenuate Switch (-6dB)",
		SGTL5000_CHIP_ANA_ADC_CTRL,
		8, 2, 0, capture_6db_attenuate),
		8, 1, 0, capture_6db_attenuate),
		SOC_SINGLE("Capture ZC Switch", SGTL5000_CHIP_ANA_CTRL, 1, 1, 0),

		SOC_DOUBLE_TLV("Headphone Playback Volume",