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

Commit f0cdcf3a authored by Zeng Zhaoming's avatar Zeng Zhaoming Committed by Mark Brown
Browse files

ASoC: sgtl5000: Enable VAG when DAC/ADC up 



As manual described, VAG is an internal voltage reference of DAC/ADC,
So enabled it before DAC/ADC up.

One more thing should care about is VAG fully ramped down requires 400ms,
wait it to avoid pop.

Signed-off-by: default avatarZeng Zhaoming <zengzm.kernel@gmail.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent dd775ae2

sound/soc/codecs/sgtl5000.c

+13 −12
Original line number Diff line number Diff line
@@ -143,11 +143,11 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w, 
}



/*

 * using codec assist to small pop, hp_powerup or lineout_powerup

 * should stay setting until vag_powerup is fully ramped down,

 * vag fully ramped down require 400ms.

 * As manual described, ADC/DAC only works when VAG powerup,

 * So enabled VAG before ADC/DAC up.

 * In power down case, we need wait 400ms when vag fully ramped down.

 */

static int small_pop_event(struct snd_soc_dapm_widget *w,

static int power_vag_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{

	switch (event) {
@@ -156,7 +156,7 @@ static int small_pop_event(struct snd_soc_dapm_widget *w, 
			SGTL5000_VAG_POWERUP, SGTL5000_VAG_POWERUP);

		break;



	case SND_SOC_DAPM_PRE_PMD:

	case SND_SOC_DAPM_POST_PMD:

		snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER,

			SGTL5000_VAG_POWERUP, 0);

		msleep(400);
@@ -201,12 +201,8 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { 
				mic_bias_event,

				SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),



	SND_SOC_DAPM_PGA_E("HP", SGTL5000_CHIP_ANA_POWER, 4, 0, NULL, 0,

			small_pop_event,

			SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),

	SND_SOC_DAPM_PGA_E("LO", SGTL5000_CHIP_ANA_POWER, 0, 0, NULL, 0,

			small_pop_event,

			SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),

	SND_SOC_DAPM_PGA("HP", SGTL5000_CHIP_ANA_POWER, 4, 0, NULL, 0),

	SND_SOC_DAPM_PGA("LO", SGTL5000_CHIP_ANA_POWER, 0, 0, NULL, 0),



	SND_SOC_DAPM_MUX("Capture Mux", SND_SOC_NOPM, 0, 0, &adc_mux),

	SND_SOC_DAPM_MUX("Headphone Mux", SND_SOC_NOPM, 0, 0, &dac_mux),
@@ -221,8 +217,11 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { 
				0, SGTL5000_CHIP_DIG_POWER,

				1, 0),



	SND_SOC_DAPM_ADC("ADC", "Capture", SGTL5000_CHIP_ANA_POWER, 1, 0),

	SND_SOC_DAPM_SUPPLY("VAG_POWER", SGTL5000_CHIP_ANA_POWER, 7, 0,

			    power_vag_event,

			    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_ADC("ADC", "Capture", SGTL5000_CHIP_ANA_POWER, 1, 0),

	SND_SOC_DAPM_DAC("DAC", "Playback", SGTL5000_CHIP_ANA_POWER, 3, 0),

};
@@ -231,9 +230,11 @@ static const struct snd_soc_dapm_route sgtl5000_dapm_routes[] = { 
	{"Capture Mux", "LINE_IN", "LINE_IN"},	/* line_in --> adc_mux */

	{"Capture Mux", "MIC_IN", "MIC_IN"},	/* mic_in --> adc_mux */



	{"ADC", NULL, "VAG_POWER"},

	{"ADC", NULL, "Capture Mux"},		/* adc_mux --> adc */

	{"AIFOUT", NULL, "ADC"},		/* adc --> i2s_out */



	{"DAC", NULL, "VAG_POWER"},

	{"DAC", NULL, "AIFIN"},			/* i2s-->dac,skip audio mux */

	{"Headphone Mux", "DAC", "DAC"},	/* dac --> hp_mux */

	{"LO", NULL, "DAC"},			/* dac --> line_out */