]> Pileus Git - ~andy/linux/commitdiff
clk: wm831x: Fix update wrong register for enable/disable FLL
authorAxel Lin <axel.lin@ingics.com>
Wed, 1 May 2013 15:31:01 +0000 (23:31 +0800)
committerMike Turquette <mturquette@linaro.org>
Wed, 29 May 2013 06:50:31 +0000 (23:50 -0700)
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>
drivers/clk/clk-wm831x.c

index 16ed06808554aa5aa92651342e3b2e88c32784a6..4bdf0b0cab9230cf08040c9b96f704fdda791ddc 100644 (file)
@@ -97,7 +97,7 @@ static int wm831x_fll_prepare(struct clk_hw *hw)
        struct wm831x *wm831x = clkdata->wm831x;
        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);
        if (ret != 0)
                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;
        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)
-               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,