ASoC: Trigger wm_hubs series update startup off a separate flag
Subsystems (3)
PATCH 1/2 ASoC: Trigger wm_hubs series update startup off a separate flag
Allowing the two to be used independently.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8993.c | 1 + sound/soc/codecs/wm8994.c | 1 + sound/soc/codecs/wm_hubs.c | 3 +-- sound/soc/codecs/wm_hubs.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-)
sound/soc/codecs/wm8993.c +1 -0
@@ -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 ) {
sound/soc/codecs/wm8994.c +1 -0
@@ -2918,6 +2918,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 ;
sound/soc/codecs/wm_hubs.c +1 -2
@@ -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,
sound/soc/codecs/wm_hubs.h +1 -0
@@ -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;
Signature · 1 line
1.7.5.4
PATCH 2/2 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 <[email protected]>
--- sound/soc/codecs/wm_hubs.c | 2 +- sound/soc/codecs/wm_hubs.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-)
sound/soc/codecs/wm_hubs.c +1 -1
@@ -194,7 +194,7 @@ static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol,/* If we're applying an offset correction then updating the * callibration would be likely to introduce further offsets. */ -if (hubs->dcs_codes) +if (hubs->dcs_codes || hubs->no_series_update)return ret;/* Only need to do this if the outputs are active */
sound/soc/codecs/wm_hubs.h +1 -0
@@ -24,6 +24,7 @@ struct wm_hubs_data {int dcs_readback_mode;int hp_startup_mode;int series_startup; +int no_series_update;bool class_w;u16 class_w_dcs;
Signature · 1 line
1.7.5.4
Quoted 10 lines · Mark Brown
Allowing the two to be used independently.
Signed-off-by Mark Brown <[email protected]>--- sound/soc/codecs/wm8993.c | 1 + sound/soc/codecs/wm8994.c | 1 + sound/soc/codecs/wm_hubs.c | 3 +-- sound/soc/codecs/wm_hubs.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-)
Both
Acked-by Liam Girdwood <[email protected]>