Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f8b3145 authored by Axel Lin's avatar Axel Lin Committed by Mike Turquette
Browse files

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: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 4564dbda

drivers/clk/clk-wm831x.c

+3 −3
Original line number Diff line number Diff line
@@ -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,