aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-25 13:49:00 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-25 18:35:21 -0400
commit021f80cc701a31c0962de7f1cc96b16309140b1f (patch)
tree075d3a3bb9adf0c1a7dc5f3826b41bfba544cac8
parent9cd8bd8a2c29dc36142c03deadafcb806b0c14f5 (diff)
ASoC: Fix dB scales for WM8990
These should be regular, not linear. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@kernel.org
-rw-r--r--sound/soc/codecs/wm8990.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 4caa509b853a..731bc0775f44 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -108,21 +108,21 @@ static const u16 wm8990_reg[] = {
108 108
109#define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0) 109#define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0)
110 110
111static const DECLARE_TLV_DB_LINEAR(rec_mix_tlv, -1500, 600); 111static const DECLARE_TLV_DB_SCALE(rec_mix_tlv, -1500, 600, 0);
112 112
113static const DECLARE_TLV_DB_LINEAR(in_pga_tlv, -1650, 3000); 113static const DECLARE_TLV_DB_SCALE(in_pga_tlv, -1650, 3000, 0);
114 114
115static const DECLARE_TLV_DB_LINEAR(out_mix_tlv, 0, -2100); 115static const DECLARE_TLV_DB_SCALE(out_mix_tlv, 0, -2100, 0);
116 116
117static const DECLARE_TLV_DB_LINEAR(out_pga_tlv, -7300, 600); 117static const DECLARE_TLV_DB_SCALE(out_pga_tlv, -7300, 600, 0);
118 118
119static const DECLARE_TLV_DB_LINEAR(out_omix_tlv, -600, 0); 119static const DECLARE_TLV_DB_SCALE(out_omix_tlv, -600, 0, 0);
120 120
121static const DECLARE_TLV_DB_LINEAR(out_dac_tlv, -7163, 0); 121static const DECLARE_TLV_DB_SCALE(out_dac_tlv, -7163, 0, 0);
122 122
123static const DECLARE_TLV_DB_LINEAR(in_adc_tlv, -7163, 1763); 123static const DECLARE_TLV_DB_SCALE(in_adc_tlv, -7163, 1763, 0);
124 124
125static const DECLARE_TLV_DB_LINEAR(out_sidetone_tlv, -3600, 0); 125static const DECLARE_TLV_DB_SCALE(out_sidetone_tlv, -3600, 0, 0);
126 126
127static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, 127static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
128 struct snd_ctl_elem_value *ucontrol) 128 struct snd_ctl_elem_value *ucontrol)
@@ -448,7 +448,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w,
448/* INMIX dB values */ 448/* INMIX dB values */
449static const unsigned int in_mix_tlv[] = { 449static const unsigned int in_mix_tlv[] = {
450 TLV_DB_RANGE_HEAD(1), 450 TLV_DB_RANGE_HEAD(1),
451 0, 7, TLV_DB_LINEAR_ITEM(-1200, 600), 451 0, 7, TLV_DB_SCALE_ITEM(-1200, 600, 0),
452}; 452};
453 453
454/* Left In PGA Connections */ 454/* Left In PGA Connections */