kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: Trigger wm_hubs series update startup off a separate flag

Browse source 
Allowing the two to be used independently.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
This commit is contained in:
Mark Brown 2011-06-07 23:23:52 +01:00
parent ec3ea54c6c
commit f9acf9fe5b
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sound/soc/codecs/wm8993.c
View file

@ -1434,6 +1434,7 @@ static int wm8993_probe(struct snd_soc_codec *codec)
wm8993->hubs_data.hp_startup_mode = 1;
wm8993->hubs_data.dcs_codes = -2;
wm8993->hubs_data.series_startup = 1;
ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
if (ret != 0) {

1
sound/soc/codecs/wm8994.c
View file

@ -2903,6 +2903,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
wm8994->hubs.dcs_codes = -5;
wm8994->hubs.hp_startup_mode = 1;
wm8994->hubs.dcs_readback_mode = 1;
wm8994->hubs.series_startup = 1;
break;
default:
wm8994->hubs.dcs_readback_mode = 1;

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

@ -107,8 +107,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
return;
}
/* Devices not using a DCS code correction have startup mode */
if (hubs->dcs_codes) {
if (hubs->series_startup) {
/* Set for 32 series updates */
snd_soc_update_bits(codec, WM8993_DC_SERVO_1,
WM8993_DCS_SERIES_NO_01_MASK,

1
sound/soc/codecs/wm_hubs.h
View file

@ -23,6 +23,7 @@ struct wm_hubs_data {
int dcs_codes;
int dcs_readback_mode;
int hp_startup_mode;
int series_startup;
bool class_w;
u16 class_w_dcs;