summaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:57:28 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:57:28 +0100
commitca0c5685ffa1a091210a7e64b9ec8b0a76db9281 (patch)
treec18108ace6605e56bf13ec9c0a9c509d9a698239 /sound/soc/codecs
parent4277c2a2a769c0dca6813ece96c09afec6cac85a (diff)
parent00aa0fac76c2f3b5a3543a63798af12c6d48b9b1 (diff)
downloadlinux-3.10-ca0c5685ffa1a091210a7e64b9ec8b0a76db9281.tar.gz
linux-3.10-ca0c5685ffa1a091210a7e64b9ec8b0a76db9281.tar.bz2
linux-3.10-ca0c5685ffa1a091210a7e64b9ec8b0a76db9281.zip
Merge remote-tracking branch 'asoc/topic/wm8903' into asoc-next
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8903.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index f8a31ad0b20..9d88437cdcd 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -478,6 +478,8 @@ static int wm8903_put_deemph(struct snd_kcontrol *kcontrol,
/* ALSA can only do steps of .01dB */
static const DECLARE_TLV_DB_SCALE(digital_tlv, -7200, 75, 1);
+static const DECLARE_TLV_DB_SCALE(dac_boost_tlv, 0, 600, 0);
+
static const DECLARE_TLV_DB_SCALE(digital_sidetone_tlv, -3600, 300, 0);
static const DECLARE_TLV_DB_SCALE(out_tlv, -5700, 100, 0);
@@ -698,6 +700,8 @@ SOC_ENUM("DAC Mute Mode", mute_mode),
SOC_SINGLE("DAC Mono Switch", WM8903_DAC_DIGITAL_1, 12, 1, 0),
SOC_ENUM("DAC Companding Mode", dac_companding),
SOC_SINGLE("DAC Companding Switch", WM8903_AUDIO_INTERFACE_0, 1, 1, 0),
+SOC_SINGLE_TLV("DAC Boost Volume", WM8903_AUDIO_INTERFACE_0, 9, 3, 0,
+ dac_boost_tlv),
SOC_SINGLE_BOOL_EXT("Playback Deemphasis Switch", 0,
wm8903_get_deemph, wm8903_put_deemph),