diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-07 18:32:46 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-23 15:05:31 -0400 |
commit | 780b75b4a0c3d6817cb2ef9493c1d1826cd6fc6b (patch) | |
tree | 18d1eb4549b0a826ae60f8c4d94847703b076b08 /sound/soc | |
parent | f9acf9fe5be653aa359c75d60fdaff03bf1ef471 (diff) |
ASoC: Allow suppression of series updates on wm_hubs devices
Some devices do not support manual updates of the DC servo.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/wm_hubs.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm_hubs.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index ee218a80e587..4ebc131b7f36 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c | |||
@@ -194,7 +194,7 @@ static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol, | |||
194 | 194 | ||
195 | /* If we're applying an offset correction then updating the | 195 | /* If we're applying an offset correction then updating the |
196 | * callibration would be likely to introduce further offsets. */ | 196 | * callibration would be likely to introduce further offsets. */ |
197 | if (hubs->dcs_codes) | 197 | if (hubs->dcs_codes || hubs->no_series_update) |
198 | return ret; | 198 | return ret; |
199 | 199 | ||
200 | /* Only need to do this if the outputs are active */ | 200 | /* Only need to do this if the outputs are active */ |
diff --git a/sound/soc/codecs/wm_hubs.h b/sound/soc/codecs/wm_hubs.h index aeb58712a0e8..0d290d2740ec 100644 --- a/sound/soc/codecs/wm_hubs.h +++ b/sound/soc/codecs/wm_hubs.h | |||
@@ -24,6 +24,7 @@ struct wm_hubs_data { | |||
24 | int dcs_readback_mode; | 24 | int dcs_readback_mode; |
25 | int hp_startup_mode; | 25 | int hp_startup_mode; |
26 | int series_startup; | 26 | int series_startup; |
27 | int no_series_update; | ||
27 | 28 | ||
28 | bool class_w; | 29 | bool class_w; |
29 | u16 class_w_dcs; | 30 | u16 class_w_dcs; |