aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-25 13:48:31 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-26 11:46:52 -0400
commit3351e9fbb0fda6498ee149ee88c67f5849813c57 (patch)
tree7411c9bb368b1e19d88949cfa34d96969fdc5a5b /sound/soc/codecs
parente6a08c5a8990102bcd1f4bae84b668da6c23caa9 (diff)
ASoC: Fix dB scales for WM8400
These scales should be regular, not linear. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Cc: stable@kernel.org
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8400.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index a7506ae2b8cc..535db3bff866 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -106,21 +106,21 @@ static void wm8400_codec_reset(struct snd_soc_codec *codec)
106 wm8400_reset_codec_reg_cache(wm8400->wm8400); 106 wm8400_reset_codec_reg_cache(wm8400->wm8400);
107} 107}
108 108
109static const DECLARE_TLV_DB_LINEAR(rec_mix_tlv, -1500, 600); 109static const DECLARE_TLV_DB_SCALE(rec_mix_tlv, -1500, 600, 0);
110 110
111static const DECLARE_TLV_DB_LINEAR(in_pga_tlv, -1650, 3000); 111static const DECLARE_TLV_DB_SCALE(in_pga_tlv, -1650, 3000, 0);
112 112
113static const DECLARE_TLV_DB_LINEAR(out_mix_tlv, -2100, 0); 113static const DECLARE_TLV_DB_SCALE(out_mix_tlv, -2100, 0, 0);
114 114
115static const DECLARE_TLV_DB_LINEAR(out_pga_tlv, -7300, 600); 115static const DECLARE_TLV_DB_SCALE(out_pga_tlv, -7300, 600, 0);
116 116
117static const DECLARE_TLV_DB_LINEAR(out_omix_tlv, -600, 0); 117static const DECLARE_TLV_DB_SCALE(out_omix_tlv, -600, 0, 0);
118 118
119static const DECLARE_TLV_DB_LINEAR(out_dac_tlv, -7163, 0); 119static const DECLARE_TLV_DB_SCALE(out_dac_tlv, -7163, 0, 0);
120 120
121static const DECLARE_TLV_DB_LINEAR(in_adc_tlv, -7163, 1763); 121static const DECLARE_TLV_DB_SCALE(in_adc_tlv, -7163, 1763, 0);
122 122
123static const DECLARE_TLV_DB_LINEAR(out_sidetone_tlv, -3600, 0); 123static const DECLARE_TLV_DB_SCALE(out_sidetone_tlv, -3600, 0, 0);
124 124
125static int wm8400_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, 125static int wm8400_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
126 struct snd_ctl_elem_value *ucontrol) 126 struct snd_ctl_elem_value *ucontrol)
@@ -439,7 +439,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w,
439/* INMIX dB values */ 439/* INMIX dB values */
440static const unsigned int in_mix_tlv[] = { 440static const unsigned int in_mix_tlv[] = {
441 TLV_DB_RANGE_HEAD(1), 441 TLV_DB_RANGE_HEAD(1),
442 0,7, TLV_DB_LINEAR_ITEM(-1200, 600), 442 0,7, TLV_DB_SCALE_ITEM(-1200, 600, 0),
443}; 443};
444 444
445/* Left In PGA Connections */ 445/* Left In PGA Connections */