lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Actively manage the DC servo for WM8903

Browse Source 
Save a little extra power by enabling the DC servo offset correction
for the output channels only when the relevant channels are enabled.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown
2009-04-22 21:03:50 +01:00
parent 4dbfe80971
commit d7d5c5476a
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/codecs/wm8903.c
View File

@@ -392,14 +392,18 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w,
struct snd_soc_codec *codec = w->codec; struct snd_soc_codec *codec = w->codec;
u16 val; u16 val;
u16 reg; u16 reg;
u16 dcs_reg;
u16 dcs_bit;
int shift; int shift;
switch (w->reg) { switch (w->reg) {
case WM8903_POWER_MANAGEMENT_2: case WM8903_POWER_MANAGEMENT_2:
reg = WM8903_ANALOGUE_HP_0; reg = WM8903_ANALOGUE_HP_0;
dcs_bit = 0 + w->shift;
break; break;
case WM8903_POWER_MANAGEMENT_3: case WM8903_POWER_MANAGEMENT_3:
reg = WM8903_ANALOGUE_LINEOUT_0; reg = WM8903_ANALOGUE_LINEOUT_0;
dcs_bit = 2 + w->shift;
break; break;
default: default:
BUG(); BUG();
@@ -439,6 +443,11 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w,
val |= (WM8903_OUTPUT_OUT << shift); val |= (WM8903_OUTPUT_OUT << shift);
wm8903_write(codec, reg, val); wm8903_write(codec, reg, val);
/* Enable the DC servo */
dcs_reg = wm8903_read(codec, WM8903_DC_SERVO_0);
dcs_reg |= dcs_bit;
wm8903_write(codec, WM8903_DC_SERVO_0, dcs_reg);
/* Remove the short */ /* Remove the short */
val |= (WM8903_OUTPUT_SHORT << shift); val |= (WM8903_OUTPUT_SHORT << shift);
wm8903_write(codec, reg, val); wm8903_write(codec, reg, val);
@@ -451,6 +460,11 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w,
val &= ~(WM8903_OUTPUT_SHORT << shift); val &= ~(WM8903_OUTPUT_SHORT << shift);
wm8903_write(codec, reg, val); wm8903_write(codec, reg, val);
/* Disable the DC servo */
dcs_reg = wm8903_read(codec, WM8903_DC_SERVO_0);
dcs_reg &= ~dcs_bit;
wm8903_write(codec, WM8903_DC_SERVO_0, dcs_reg);
/* Then disable the intermediate and output stages */ /* Then disable the intermediate and output stages */
val &= ~((WM8903_OUTPUT_OUT | WM8903_OUTPUT_INT | val &= ~((WM8903_OUTPUT_OUT | WM8903_OUTPUT_INT |
WM8903_OUTPUT_IN) << shift); WM8903_OUTPUT_IN) << shift);