diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:29:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:29:01 +0100 |
| commit | 5f081e1ebbf8e4a52a68e9443903bf5e223c72ed (patch) | |
| tree | 90b361c22fe988ed8046227e6d09b30dc058a46c /sound/soc | |
| parent | 16f135f08f73b90e8c3a57309a1d90cecfc79481 (diff) | |
| parent | c324aac01be55253488aba9481523cd6f546f4ca (diff) | |
| download | op-kernel-dev-5f081e1ebbf8e4a52a68e9443903bf5e223c72ed.zip op-kernel-dev-5f081e1ebbf8e4a52a68e9443903bf5e223c72ed.tar.gz | |
Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 5e5af89..f156010 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -263,8 +263,8 @@ SOC_SINGLE("ALC Attack", WM8960_ALC3, 0, 15, 0), SOC_SINGLE("Noise Gate Threshold", WM8960_NOISEG, 3, 31, 0), SOC_SINGLE("Noise Gate Switch", WM8960_NOISEG, 0, 1, 0), -SOC_DOUBLE_R("ADC PCM Capture Volume", WM8960_LINPATH, WM8960_RINPATH, - 0, 127, 0), +SOC_DOUBLE_R_TLV("ADC PCM Capture Volume", WM8960_LADC, WM8960_RADC, + 0, 255, 0, adc_tlv), SOC_SINGLE_TLV("Left Output Mixer Boost Bypass Volume", WM8960_BYPASS1, 4, 7, 1, bypass_tlv), |
