openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: wm831x: Fix update wrong register for enable/disable FLL 

According to the datasheet, FLL Enable is controlled by
R16530 (4092h) FLL Control1
        BIT 0: FLL Enable
                0 = Disable
                1 = Enable

Thus the code should update WM831X_FLL_CONTROL_1 register rather than
WM831X_FLL_CONTROL_2 register.

Also fixes a trivial typo in dev_crit message.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
This commit is contained in:
Axel Lin 2013-05-01 23:31:01 +08:00 committed by Mike Turquette
parent 4564dbdadc
commit 6f8b314583
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/clk/clk-wm831x.c
View File

@ -97,7 +97,7 @@ static int wm831x_fll_prepare(struct clk_hw *hw)
struct wm831x *wm831x = clkdata->wm831x; struct wm831x *wm831x = clkdata->wm831x;
int ret; int ret;
ret = wm831x_set_bits(wm831x, WM831X_FLL_CONTROL_2, ret = wm831x_set_bits(wm831x, WM831X_FLL_CONTROL_1,
WM831X_FLL_ENA, WM831X_FLL_ENA); WM831X_FLL_ENA, WM831X_FLL_ENA);
if (ret != 0) if (ret != 0)
dev_crit(wm831x->dev, "Failed to enable FLL: %d\n", ret); dev_crit(wm831x->dev, "Failed to enable FLL: %d\n", ret);
@ -114,9 +114,9 @@ static void wm831x_fll_unprepare(struct clk_hw *hw)
struct wm831x *wm831x = clkdata->wm831x; struct wm831x *wm831x = clkdata->wm831x;
int ret; int ret;
ret = wm831x_set_bits(wm831x, WM831X_FLL_CONTROL_2, WM831X_FLL_ENA, 0); ret = wm831x_set_bits(wm831x, WM831X_FLL_CONTROL_1, WM831X_FLL_ENA, 0);
if (ret != 0) if (ret != 0)
dev_crit(wm831x->dev, "Failed to disaable FLL: %d\n", ret); dev_crit(wm831x->dev, "Failed to disable FLL: %d\n", ret);
} }
static unsigned long wm831x_fll_recalc_rate(struct clk_hw *hw, static unsigned long wm831x_fll_recalc_rate(struct clk_hw *hw,