diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-25 13:49:00 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-26 11:46:53 -0400 |
commit | f68596c6d8711650722b2a54328a088a2c21bc5b (patch) | |
tree | 3d8decb9d92f7d76daf82038e4994e0ae5272b17 | |
parent | 3351e9fbb0fda6498ee149ee88c67f5849813c57 (diff) |
ASoC: Fix dB scales for WM8990
These 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
-rw-r--r-- | sound/soc/codecs/wm8990.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 9a9528e9044e..b6c003f9e862 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c | |||
@@ -110,21 +110,21 @@ static const u16 wm8990_reg[] = { | |||
110 | 110 | ||
111 | #define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0) | 111 | #define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0) |
112 | 112 | ||
113 | static const DECLARE_TLV_DB_LINEAR(rec_mix_tlv, -1500, 600); | 113 | static const DECLARE_TLV_DB_SCALE(rec_mix_tlv, -1500, 600, 0); |
114 | 114 | ||
115 | static const DECLARE_TLV_DB_LINEAR(in_pga_tlv, -1650, 3000); | 115 | static const DECLARE_TLV_DB_SCALE(in_pga_tlv, -1650, 3000, 0); |
116 | 116 | ||
117 | static const DECLARE_TLV_DB_LINEAR(out_mix_tlv, 0, -2100); | 117 | static const DECLARE_TLV_DB_SCALE(out_mix_tlv, 0, -2100, 0); |
118 | 118 | ||
119 | static const DECLARE_TLV_DB_LINEAR(out_pga_tlv, -7300, 600); | 119 | static const DECLARE_TLV_DB_SCALE(out_pga_tlv, -7300, 600, 0); |
120 | 120 | ||
121 | static const DECLARE_TLV_DB_LINEAR(out_omix_tlv, -600, 0); | 121 | static const DECLARE_TLV_DB_SCALE(out_omix_tlv, -600, 0, 0); |
122 | 122 | ||
123 | static const DECLARE_TLV_DB_LINEAR(out_dac_tlv, -7163, 0); | 123 | static const DECLARE_TLV_DB_SCALE(out_dac_tlv, -7163, 0, 0); |
124 | 124 | ||
125 | static const DECLARE_TLV_DB_LINEAR(in_adc_tlv, -7163, 1763); | 125 | static const DECLARE_TLV_DB_SCALE(in_adc_tlv, -7163, 1763, 0); |
126 | 126 | ||
127 | static const DECLARE_TLV_DB_LINEAR(out_sidetone_tlv, -3600, 0); | 127 | static const DECLARE_TLV_DB_SCALE(out_sidetone_tlv, -3600, 0, 0); |
128 | 128 | ||
129 | static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, | 129 | static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, |
130 | struct snd_ctl_elem_value *ucontrol) | 130 | struct snd_ctl_elem_value *ucontrol) |
@@ -450,7 +450,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w, | |||
450 | /* INMIX dB values */ | 450 | /* INMIX dB values */ |
451 | static const unsigned int in_mix_tlv[] = { | 451 | static const unsigned int in_mix_tlv[] = { |
452 | TLV_DB_RANGE_HEAD(1), | 452 | TLV_DB_RANGE_HEAD(1), |
453 | 0, 7, TLV_DB_LINEAR_ITEM(-1200, 600), | 453 | 0, 7, TLV_DB_SCALE_ITEM(-1200, 600, 0), |
454 | }; | 454 | }; |
455 | 455 | ||
456 | /* Left In PGA Connections */ | 456 | /* Left In PGA Connections */ |