AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ALSA: ASoC: Factor PGA DAPM handling into main

Browse Source 
This allows pre and post event hooks to be provided for PGA widgets.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Mark Brown 2008-07-17 15:06:51 +01:00 committed by Takashi Iwai
parent 2927d6eeca
commit 9dd8d812d3
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sound/soc/soc-dapm.c
View File

@ -523,24 +523,6 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
continue; continue;
} }
/* programmable gain/attenuation */
if (w->id == snd_soc_dapm_pga) {
int on;
in = is_connected_input_ep(w);
dapm_clear_walk(w->codec);
out = is_connected_output_ep(w);
dapm_clear_walk(w->codec);
w->power = on = (out != 0 && in != 0) ? 1 : 0;
if (!on)
dapm_set_pga(w, on); /* lower volume to reduce pops */
dapm_update_bits(w);
if (on)
dapm_set_pga(w, on); /* restore volume from zero */
continue;
}
/* pre and post event widgets */ /* pre and post event widgets */
if (w->id == snd_soc_dapm_pre) { if (w->id == snd_soc_dapm_pre) {
if (!w->event) if (!w->event)
@ -611,8 +593,16 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
return ret; return ret;
} }
/* Lower PGA volume to reduce pops */
if (w->id == snd_soc_dapm_pga && !power)
dapm_set_pga(w, power);
dapm_update_bits(w); dapm_update_bits(w);
/* Raise PGA volume to reduce pops */
if (w->id == snd_soc_dapm_pga && power)
dapm_set_pga(w, power);
/* power up post event */ /* power up post event */
if (power && w->event && if (power && w->event &&
(w->event_flags & SND_SOC_DAPM_POST_PMU)) { (w->event_flags & SND_SOC_DAPM_POST_PMU)) {