redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: Handle low measured DC offsets for wm_hubs devices

Browse source 
The DC servo codes are actually signed numbers so need to be treated as
such.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: stable@kernel.org
This commit is contained in:
Mark Brown 2011-01-21 12:47:33 +00:00
parent dc5a460a1b
commit 20a4e7fc7e
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sound/soc/codecs/wm_hubs.c
View file

@ -91,6 +91,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op)
static void calibrate_dc_servo(struct snd_soc_codec *codec) static void calibrate_dc_servo(struct snd_soc_codec *codec)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
s8 offset;
u16 reg, reg_l, reg_r, dcs_cfg; u16 reg, reg_l, reg_r, dcs_cfg;
/* If we're using a digital only path and have a previously /* If we're using a digital only path and have a previously
@ -149,16 +150,14 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
hubs->dcs_codes); hubs->dcs_codes);
/* HPOUT1L */ /* HPOUT1L */
if (reg_l + hubs->dcs_codes > 0 && offset = reg_l;
reg_l + hubs->dcs_codes < 0xff) offset += hubs->dcs_codes;
reg_l += hubs->dcs_codes; dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT;
dcs_cfg = reg_l << WM8993_DCS_DAC_WR_VAL_1_SHIFT;
/* HPOUT1R */ /* HPOUT1R */
if (reg_r + hubs->dcs_codes > 0 && offset = reg_r;
reg_r + hubs->dcs_codes < 0xff) offset += hubs->dcs_codes;
reg_r += hubs->dcs_codes; dcs_cfg |= (u8)offset;
dcs_cfg |= reg_r;
dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg); dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg);