diff options
author | Joonyoung Shim <jy0922.shim@samsung.com> | 2009-04-28 05:18:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-28 11:11:22 -0400 |
commit | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (patch) | |
tree | 22b4bde5fe55b41f6fac65b566be1d0f28aed8e3 /sound/soc/codecs/twl4030.c | |
parent | 0c95de73a711d376dc17afe484f919bd5b66c016 (diff) |
ASoC: TWL4030: Fix gain control for earpiece amplifier
The gain control for earpiece amplifier uses 0dB ~ 12dB according to the
TRM, but the present code is implemented to -6dB ~ 6dB.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
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 921b205de28a..df7c8c281d2f 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -836,6 +836,12 @@ static DECLARE_TLV_DB_SCALE(analog_tlv, -2400, 200, 0); | |||
836 | static DECLARE_TLV_DB_SCALE(output_tvl, -1200, 600, 1); | 836 | static DECLARE_TLV_DB_SCALE(output_tvl, -1200, 600, 1); |
837 | 837 | ||
838 | /* | 838 | /* |
839 | * Gain control for earpiece amplifier | ||
840 | * 0 dB to 12 dB in 6 dB steps (mute instead of -6) | ||
841 | */ | ||
842 | static DECLARE_TLV_DB_SCALE(output_ear_tvl, -600, 600, 1); | ||
843 | |||
844 | /* | ||
839 | * Capture gain after the ADCs | 845 | * Capture gain after the ADCs |
840 | * from 0 dB to 31 dB in 1 dB steps | 846 | * from 0 dB to 31 dB in 1 dB steps |
841 | */ | 847 | */ |
@@ -900,7 +906,7 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = { | |||
900 | 4, 3, 0, output_tvl), | 906 | 4, 3, 0, output_tvl), |
901 | 907 | ||
902 | SOC_SINGLE_TLV_TWL4030("Earpiece Playback Volume", | 908 | SOC_SINGLE_TLV_TWL4030("Earpiece Playback Volume", |
903 | TWL4030_REG_EAR_CTL, 4, 3, 0, output_tvl), | 909 | TWL4030_REG_EAR_CTL, 4, 3, 0, output_ear_tvl), |
904 | 910 | ||
905 | /* Common capture gain controls */ | 911 | /* Common capture gain controls */ |
906 | SOC_DOUBLE_R_TLV("TX1 Digital Capture Volume", | 912 | SOC_DOUBLE_R_TLV("TX1 Digital Capture Volume", |