diff options
| author | Axel Lin <axel.lin@ingics.com> | 2013-05-01 23:31:01 +0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2013-05-28 23:50:31 -0700 |
| commit | 6f8b314583c9407bda9f215f25d7b316ae8a7058 (patch) | |
| tree | 78644002e8b2188cdb681a1d824ef1867f54d212 /drivers/clk/clk-wm831x.c | |
| parent | 4564dbdadc1814a9ee300b6d3c5b7179bc8a8c80 (diff) | |
| download | talos-obmc-linux-6f8b314583c9407bda9f215f25d7b316ae8a7058.tar.gz talos-obmc-linux-6f8b314583c9407bda9f215f25d7b316ae8a7058.zip | |
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>
Diffstat (limited to 'drivers/clk/clk-wm831x.c')
| -rw-r--r-- | drivers/clk/clk-wm831x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/clk-wm831x.c b/drivers/clk/clk-wm831x.c index 16ed06808554..4bdf0b0cab92 100644 --- a/drivers/clk/clk-wm831x.c +++ b/drivers/clk/clk-wm831x.c @@ -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, |
