aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-28 19:33:45 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-28 19:33:45 +0100
commit72e31981a4e91f84c5b5e8994f5d25b1cf22b6cf (patch)
treec22d96020b732c6d26067985b2e1b01a8321ac8c
parent6be01cfb854818298753bfce65543dbc81d51d5a (diff)
parent18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff)
Merge branch 'for-2.6.30' into for-2.6.31
-rw-r--r--sound/soc/codecs/twl4030.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index e23c20c42f1..efa1a80b806 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -803,6 +803,12 @@ static DECLARE_TLV_DB_SCALE(analog_tlv, -2400, 200, 0);
static DECLARE_TLV_DB_SCALE(output_tvl, -1200, 600, 1);
/*
+ * Gain control for earpiece amplifier
+ * 0 dB to 12 dB in 6 dB steps (mute instead of -6)
+ */
+static DECLARE_TLV_DB_SCALE(output_ear_tvl, -600, 600, 1);
+
+/*
* Capture gain after the ADCs
* from 0 dB to 31 dB in 1 dB steps
*/
@@ -877,7 +883,7 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = {
4, 3, 0, output_tvl),
SOC_SINGLE_TLV_TWL4030("Earpiece Playback Volume",
- TWL4030_REG_EAR_CTL, 4, 3, 0, output_tvl),
+ TWL4030_REG_EAR_CTL, 4, 3, 0, output_ear_tvl),
/* Common capture gain controls */
SOC_DOUBLE_R_TLV("TX1 Digital Capture Volume",