git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[pandora-kernel.git]
/
sound
/
soc
/
codecs
/
wm8990.c
diff --git
a/sound/soc/codecs/wm8990.c
b/sound/soc/codecs/wm8990.c
index
7b536d9
..
c018772
100644
(file)
--- a/
sound/soc/codecs/wm8990.c
+++ b/
sound/soc/codecs/wm8990.c
@@
-111,21
+111,21
@@
static const u16 wm8990_reg[] = {
#define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0)
#define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0)
-static const DECLARE_TLV_DB_
LINEAR(rec_mix_tlv, -1500, 60
0);
+static const DECLARE_TLV_DB_
SCALE(rec_mix_tlv, -1500, 600,
0);
-static const DECLARE_TLV_DB_
LINEAR(in_pga_tlv, -1650, 300
0);
+static const DECLARE_TLV_DB_
SCALE(in_pga_tlv, -1650, 3000,
0);
-static const DECLARE_TLV_DB_
LINEAR(out_mix_tlv, 0, -210
0);
+static const DECLARE_TLV_DB_
SCALE(out_mix_tlv, 0, -2100,
0);
-static const DECLARE_TLV_DB_
LINEAR(out_pga_tlv, -7300, 60
0);
+static const DECLARE_TLV_DB_
SCALE(out_pga_tlv, -7300, 600,
0);
-static const DECLARE_TLV_DB_
LINEAR(out_omix_tlv, -60
0, 0);
+static const DECLARE_TLV_DB_
SCALE(out_omix_tlv, -600,
0, 0);
-static const DECLARE_TLV_DB_
LINEAR(out_dac_tlv, -7163
, 0);
+static const DECLARE_TLV_DB_
SCALE(out_dac_tlv, -7163, 0
, 0);
-static const DECLARE_TLV_DB_
LINEAR(in_adc_tlv, -7163, 1763
);
+static const DECLARE_TLV_DB_
SCALE(in_adc_tlv, -7163, 1763, 0
);
-static const DECLARE_TLV_DB_
LINEAR(out_sidetone_tlv, -360
0, 0);
+static const DECLARE_TLV_DB_
SCALE(out_sidetone_tlv, -3600,
0, 0);
static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
@@
-451,7
+451,7
@@
static int outmixer_event(struct snd_soc_dapm_widget *w,
/* INMIX dB values */
static const unsigned int in_mix_tlv[] = {
TLV_DB_RANGE_HEAD(1),
/* INMIX dB values */
static const unsigned int in_mix_tlv[] = {
TLV_DB_RANGE_HEAD(1),
- 0, 7, TLV_DB_
LINEAR_ITEM(-1200, 60
0),
+ 0, 7, TLV_DB_
SCALE_ITEM(-1200, 600,
0),
};
/* Left In PGA Connections */
};
/* Left In PGA Connections */