diff options
Diffstat (limited to 'sound/soc/codecs/wm8960.c')
-rw-r--r-- | sound/soc/codecs/wm8960.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 0a4ffdd1d2a7..f156010e52bc 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), | |||
263 | SOC_SINGLE("Noise Gate Threshold", WM8960_NOISEG, 3, 31, 0), | 263 | SOC_SINGLE("Noise Gate Threshold", WM8960_NOISEG, 3, 31, 0), |
264 | SOC_SINGLE("Noise Gate Switch", WM8960_NOISEG, 0, 1, 0), | 264 | SOC_SINGLE("Noise Gate Switch", WM8960_NOISEG, 0, 1, 0), |
265 | 265 | ||
266 | SOC_DOUBLE_R("ADC PCM Capture Volume", WM8960_LINPATH, WM8960_RINPATH, | 266 | SOC_DOUBLE_R_TLV("ADC PCM Capture Volume", WM8960_LADC, WM8960_RADC, |
267 | 0, 127, 0), | 267 | 0, 255, 0, adc_tlv), |
268 | 268 | ||
269 | SOC_SINGLE_TLV("Left Output Mixer Boost Bypass Volume", | 269 | SOC_SINGLE_TLV("Left Output Mixer Boost Bypass Volume", |
270 | WM8960_BYPASS1, 4, 7, 1, bypass_tlv), | 270 | WM8960_BYPASS1, 4, 7, 1, bypass_tlv), |
@@ -857,9 +857,9 @@ static int wm8960_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, | |||
857 | if (pll_div.k) { | 857 | if (pll_div.k) { |
858 | reg |= 0x20; | 858 | reg |= 0x20; |
859 | 859 | ||
860 | snd_soc_write(codec, WM8960_PLL2, (pll_div.k >> 18) & 0x3f); | 860 | snd_soc_write(codec, WM8960_PLL2, (pll_div.k >> 16) & 0xff); |
861 | snd_soc_write(codec, WM8960_PLL3, (pll_div.k >> 9) & 0x1ff); | 861 | snd_soc_write(codec, WM8960_PLL3, (pll_div.k >> 8) & 0xff); |
862 | snd_soc_write(codec, WM8960_PLL4, pll_div.k & 0x1ff); | 862 | snd_soc_write(codec, WM8960_PLL4, pll_div.k & 0xff); |
863 | } | 863 | } |
864 | snd_soc_write(codec, WM8960_PLL1, reg); | 864 | snd_soc_write(codec, WM8960_PLL1, reg); |
865 | 865 | ||