summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8350.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-05-27 09:46:10 +0200
committerTakashi Iwai <tiwai@suse.de>2010-05-27 09:46:10 +0200
commit274a24c16fa97a1fc67437b191274db2286c7ac3 (patch)
treea7a452ec3ef403f647791128556598441c272f07 /sound/soc/codecs/wm8350.c
parent7f06a8b26aba1dc03b42272dc0089a800372c575 (diff)
parentf68596c6d8711650722b2a54328a088a2c21bc5b (diff)
downloadop-kernel-dev-274a24c16fa97a1fc67437b191274db2286c7ac3.zip
op-kernel-dev-274a24c16fa97a1fc67437b191274db2286c7ac3.tar.gz
Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'sound/soc/codecs/wm8350.c')
-rw-r--r--sound/soc/codecs/wm8350.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 8ae2020..0221ca7 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -426,8 +426,8 @@ static const struct soc_enum wm8350_enum[] = {
SOC_ENUM_SINGLE(WM8350_INPUT_MIXER_VOLUME, 15, 2, wm8350_lr),
};
-static DECLARE_TLV_DB_LINEAR(pre_amp_tlv, -1200, 3525);
-static DECLARE_TLV_DB_LINEAR(out_pga_tlv, -5700, 600);
+static DECLARE_TLV_DB_SCALE(pre_amp_tlv, -1200, 3525, 0);
+static DECLARE_TLV_DB_SCALE(out_pga_tlv, -5700, 600, 0);
static DECLARE_TLV_DB_SCALE(dac_pcm_tlv, -7163, 36, 1);
static DECLARE_TLV_DB_SCALE(adc_pcm_tlv, -12700, 50, 1);
static DECLARE_TLV_DB_SCALE(out_mix_tlv, -1500, 300, 1);
OpenPOWER on IntegriCloud