ASoC: Fix broken bitfield definitions in WM8978
Subsystems (3)
PATCH 1/2 ASoC: Fix broken bitfield definitions in WM8978
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8978.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
sound/soc/codecs/wm8978.c +8 -6
@@ -145,18 +145,18 @@ static const struct snd_kcontrol_new wm8978_snd_controls[] = {SOC_SINGLE ("DAC Playback Limiter Threshold" ,WM8978_DAC_LIMITER_2 ,4 ,7 ,0 ),SOC_SINGLE ("DAC Playback Limiter Boost" , -WM8978_DAC_LIMITER_2 ,0 ,15 ,0 ), +WM8978_DAC_LIMITER_2 ,0 ,12 ,0 ),SOC_ENUM ("ALC Enable Switch" , alc1),SOC_SINGLE ("ALC Capture Min Gain" ,WM8978_ALC_CONTROL_1 ,0 ,7 ,0 ),SOC_SINGLE ("ALC Capture Max Gain" ,WM8978_ALC_CONTROL_1 ,3 ,7 ,0 ), -SOC_SINGLE ("ALC Capture Hold" ,WM8978_ALC_CONTROL_2 ,4 ,7 ,0 ), +SOC_SINGLE ("ALC Capture Hold" ,WM8978_ALC_CONTROL_2 ,4 ,10 ,0 ),SOC_SINGLE ("ALC Capture Target" ,WM8978_ALC_CONTROL_2 ,0 ,15 ,0 ),SOC_ENUM ("ALC Capture Mode" , alc3), -SOC_SINGLE ("ALC Capture Decay" ,WM8978_ALC_CONTROL_3 ,4 ,15 ,0 ), -SOC_SINGLE ("ALC Capture Attack" ,WM8978_ALC_CONTROL_3 ,0 ,15 ,0 ), +SOC_SINGLE ("ALC Capture Decay" ,WM8978_ALC_CONTROL_3 ,4 ,10 ,0 ), +SOC_SINGLE ("ALC Capture Attack" ,WM8978_ALC_CONTROL_3 ,0 ,10 ,0 ),SOC_SINGLE ("ALC Capture Noise Gate Switch" ,WM8978_NOISE_GATE ,3 ,1 ,0 ), SOC_SINGLE("ALC Capture Noise Gate Threshold",
@@ -211,8 +211,10 @@ static const struct snd_kcontrol_new wm8978_snd_controls[] = { WM8978_LOUT2_SPK_CONTROL, WM8978_ROUT2_SPK_CONTROL, 6, 1, 1),/* DAC / ADC oversampling */ -SOC_SINGLE ("DAC 128x Oversampling Switch" ,WM8978_DAC_CONTROL ,8 ,1 ,0 ), - SOC_SINGLE("ADC 128x Oversampling Switch", WM8978_ADC_CONTROL, 8, 1, 0), +SOC_SINGLE ("DAC 128x Oversampling Switch" ,WM8978_DAC_CONTROL , +5 ,1 ,0 ), +SOC_SINGLE ("ADC 128x Oversampling Switch" ,WM8978_ADC_CONTROL , + 5, 1, 0), };/* Mixer #1: Output (OUT1, OUT2) Mixer: mix AUX, Input mixer output and DAC */
Signature · 1 line
1.7.2.3
PATCH 2/2 ASoC: Add TLV information for WM8978 DAC limiter
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8978.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
sound/soc/codecs/wm8978.c +3 -2
@@ -93,6 +93,7 @@ static const DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0); static const DECLARE_TLV_DB_SCALE(inpga_tlv, -1200, 75, 0); static const DECLARE_TLV_DB_SCALE(spk_tlv, -5700, 100, 0); static const DECLARE_TLV_DB_SCALE(boost_tlv, -1500, 300, 1); +static const DECLARE_TLV_DB_SCALE(limiter_tlv, 0, 100, 0);static const struct snd_kcontrol_new wm8978_snd_controls[] = {
@@ -144,8 +145,8 @@ static const struct snd_kcontrol_new wm8978_snd_controls[] = {SOC_SINGLE ("DAC Playback Limiter Threshold" ,WM8978_DAC_LIMITER_2 ,4 ,7 ,0 ), -SOC_SINGLE ("DAC Playback Limiter Boost" , -WM8978_DAC_LIMITER_2 ,0 ,12 ,0 ), +SOC_SINGLE_TLV ("DAC Playback Limiter Volume" , +WM8978_DAC_LIMITER_2 ,0 ,12 ,0 , limiter_tlv),SOC_ENUM ("ALC Enable Switch" , alc1), SOC_SINGLE("ALC Capture Min Gain", WM8978_ALC_CONTROL_1, 0, 7, 0),
Signature · 1 line
1.7.2.3
Quoted 4 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>--- sound/soc/codecs/wm8978.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
Both
Acked-by Liam Girdwood <[email protected]>