aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-05-15 09:15:16 +0800
committerBen Hutchings <ben@decadent.org.uk>2015-08-12 16:33:12 +0200
commitbcbfc397673790594d6b6c94ed9f49d122e0e2f3 (patch)
tree113d4cefa0e4ac7df38a59ee3483500ab5e8eb52 /sound
parent77afea45cd663215a4fe7fe6f68ae30c0f00a414 (diff)
downloadkernel_samsung_smdk4412-bcbfc397673790594d6b6c94ed9f49d122e0e2f3.zip
kernel_samsung_smdk4412-bcbfc397673790594d6b6c94ed9f49d122e0e2f3.tar.gz
kernel_samsung_smdk4412-bcbfc397673790594d6b6c94ed9f49d122e0e2f3.tar.bz2
ASoC: wm8955: Fix setting wrong register for WM8955_K_8_0_MASK bits
commit 12c350050538c7dc779c083b7342bfd20f74949c upstream. WM8955_K_8_0_MASK bits is controlled by WM8955_PLL_CONTROL_3 rather than WM8955_PLL_CONTROL_2. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8955.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index 77ff1d7..f8b9930 100644
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -282,7 +282,7 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec)
snd_soc_update_bits(codec, WM8955_PLL_CONTROL_2,
WM8955_K_17_9_MASK,
(pll.k >> 9) & WM8955_K_17_9_MASK);
- snd_soc_update_bits(codec, WM8955_PLL_CONTROL_2,
+ snd_soc_update_bits(codec, WM8955_PLL_CONTROL_3,
WM8955_K_8_0_MASK,
pll.k & WM8955_K_8_0_MASK);
if (pll.k)