diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-26 18:36:37 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-03 22:23:53 -0500 |
commit | 21eb2693dd3bb701f831588977f92c4b63eeb132 (patch) | |
tree | 732a15af27cec9f230b5e78de580ed6dad6d0f5f | |
parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) |
ASoC: wm8960: Add input boost volume control
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/codecs/wm8960.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 9bb927325993..3fea242cbf1a 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c | |||
@@ -204,6 +204,7 @@ static const DECLARE_TLV_DB_SCALE(adc_tlv, -9700, 50, 0); | |||
204 | static const DECLARE_TLV_DB_SCALE(dac_tlv, -12700, 50, 1); | 204 | static const DECLARE_TLV_DB_SCALE(dac_tlv, -12700, 50, 1); |
205 | static const DECLARE_TLV_DB_SCALE(bypass_tlv, -2100, 300, 0); | 205 | static const DECLARE_TLV_DB_SCALE(bypass_tlv, -2100, 300, 0); |
206 | static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1); | 206 | static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1); |
207 | static const DECLARE_TLV_DB_SCALE(boost_tlv, -1200, 300, 1); | ||
207 | 208 | ||
208 | static const struct snd_kcontrol_new wm8960_snd_controls[] = { | 209 | static const struct snd_kcontrol_new wm8960_snd_controls[] = { |
209 | SOC_DOUBLE_R_TLV("Capture Volume", WM8960_LINVOL, WM8960_RINVOL, | 210 | SOC_DOUBLE_R_TLV("Capture Volume", WM8960_LINVOL, WM8960_RINVOL, |
@@ -213,6 +214,15 @@ SOC_DOUBLE_R("Capture Volume ZC Switch", WM8960_LINVOL, WM8960_RINVOL, | |||
213 | SOC_DOUBLE_R("Capture Switch", WM8960_LINVOL, WM8960_RINVOL, | 214 | SOC_DOUBLE_R("Capture Switch", WM8960_LINVOL, WM8960_RINVOL, |
214 | 7, 1, 0), | 215 | 7, 1, 0), |
215 | 216 | ||
217 | SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT3 Volume", | ||
218 | WM8960_INBMIX1, 4, 7, 0, boost_tlv), | ||
219 | SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT2 Volume", | ||
220 | WM8960_INBMIX1, 1, 7, 0, boost_tlv), | ||
221 | SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT3 Volume", | ||
222 | WM8960_INBMIX2, 4, 7, 0, boost_tlv), | ||
223 | SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT2 Volume", | ||
224 | WM8960_INBMIX2, 1, 7, 0, boost_tlv), | ||
225 | |||
216 | SOC_DOUBLE_R_TLV("Playback Volume", WM8960_LDAC, WM8960_RDAC, | 226 | SOC_DOUBLE_R_TLV("Playback Volume", WM8960_LDAC, WM8960_RDAC, |
217 | 0, 255, 0, dac_tlv), | 227 | 0, 255, 0, dac_tlv), |
218 | 228 | ||