From 1151a5a99e807caedfd98118922b9ab38651d4ea Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Mon, 1 Apr 2013 17:51:30 +0800 Subject: ENGR00256820-1 ASoC: WM8962: revert FLL-disable before FLL-setting The patch at the commit 30293bc6 dropped FLL-disabling code from wm8962 driver, which was a work around for CR 00209905. Since we fixed the issue in a better way(commit 018958f4), we don't need the work around any more. And in wm8962's datasheet, Wolfson suggests that driver should disable and re-enable the FLL after the other registers're updated. So it's better for us to revert the code to prevent some potential issue. Acked-by: Wang Shengjiu Signed-off-by: Nicolin Chen --- sound/soc/codecs/wm8962.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 6e7a5e9e9444..9acae3004c72 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3461,6 +3461,9 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source, if (fll_div.theta || fll_div.lambda) fll1 |= WM8962_FLL_FRAC; + /* Stop the FLL while we reconfigure */ + snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1, WM8962_FLL_ENA, 0); + snd_soc_update_bits(codec, WM8962_FLL_CONTROL_2, WM8962_FLL_OUTDIV_MASK | WM8962_FLL_REFCLK_DIV_MASK, -- cgit v1.2.3