diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-07-17 15:06:51 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-07-17 16:17:17 +0200 |
| commit | 9dd8d812d3b4d208a769ca3cf23a7f9294632d0d (patch) | |
| tree | 779b9c5902acac0015a3875f10e4f74680e8d954 /sound | |
| parent | 2927d6eeca0a5004d81fa5bedbdf3f2b1b842903 (diff) | |
| download | kernel-common-9dd8d812d3b4d208a769ca3cf23a7f9294632d0d.tar.gz kernel-common-9dd8d812d3b4d208a769ca3cf23a7f9294632d0d.tar.bz2 kernel-common-9dd8d812d3b4d208a769ca3cf23a7f9294632d0d.zip | |
ALSA: ASoC: Factor PGA DAPM handling into main
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 17698ef58dfb..820347c9ae4b 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -523,24 +523,6 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event) 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 */ if (w->id == snd_soc_dapm_pre) { if (!w->event) @@ -611,8 +593,16 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event) 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); + /* Raise PGA volume to reduce pops */ + if (w->id == snd_soc_dapm_pga && power) + dapm_set_pga(w, power); + /* power up post event */ if (power && w->event && (w->event_flags & SND_SOC_DAPM_POST_PMU)) { |