summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorb02247 <b02247@freescale.com>2012-10-29 14:03:22 +0800
committerb02247 <b02247@freescale.com>2012-10-31 16:00:31 +0800
commitfbb6d62e15a05b4c006b63ea8cd9f9e175fde70d (patch)
treec574f0303f7af19fa137b7b537464f3e857a3981
parent4ac3d31931883c32cbe038a2683a1a1ed4c9c39b (diff)
ENGR00230381 There is noise for some bitstream
Revert "ENGR00219882 wm8962: avoid the digital volume changed by user" This reverts commit 18079ec20d80ecccf8279c70c9e67b6ebf8b3f22. Digital volume will be used by the DSP of wm8962 to scale the input digital signal. Main branch remove this mixer control, but set the default value exceed 0dB, which will cause noise when the signal has maximum amplitude. Move this control back, then the user space can set this value by itself. Signed-off-by: b02247 <b02247@freescale.com>
-rw-r--r--sound/soc/codecs/wm8962.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 784b5957e37a..b14531157067 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2218,6 +2218,8 @@ SOC_ENUM("Capture LHPF Mode", cap_lhpf_mode),
SOC_DOUBLE_R_TLV("Sidetone Volume", WM8962_DAC_DSP_MIXING_1,
WM8962_DAC_DSP_MIXING_2, 4, 12, 0, st_tlv),
+SOC_DOUBLE_R_TLV("Digital Playback Volume", WM8962_LEFT_DAC_VOLUME,
+ WM8962_RIGHT_DAC_VOLUME, 1, 127, 0, digital_tlv),
SOC_SINGLE("DAC High Performance Switch", WM8962_ADC_DAC_CONTROL_2, 0, 1, 0),
SOC_SINGLE("ADC High Performance Switch", WM8962_ADDITIONAL_CONTROL_1,