diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-28 20:33:45 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-28 20:33:45 +0200 |
| commit | 72e31981a4e91f84c5b5e8994f5d25b1cf22b6cf (patch) | |
| tree | c22d96020b732c6d26067985b2e1b01a8321ac8c /sound/soc/codecs/twl4030.c | |
| parent | ASoC: Staticise TLV values in WM8940 (diff) | |
| parent | ASoC: TWL4030: Fix gain control for earpiece amplifier (diff) | |
| download | linux-72e31981a4e91f84c5b5e8994f5d25b1cf22b6cf.tar.xz linux-72e31981a4e91f84c5b5e8994f5d25b1cf22b6cf.zip | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/soc/codecs/twl4030.c')
| -rw-r--r-- | sound/soc/codecs/twl4030.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index e23c20c42f19..efa1a80b806c 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", |