From: mturquette@linaro.org (Mike Turquette)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFT][PATCH 1/2] clk: wm831x: Fix update wrong register for enable/disable FLL
Date: Tue, 28 May 2013 23:51:19 -0700 [thread overview]
Message-ID: <20130529065119.6058.68188@quantum> (raw)
In-Reply-To: <1367422261.8160.1.camel@phoenix>
Quoting Axel Lin (2013-05-01 08:31:01)
> 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>
Pulled both into clk-next.
Thanks,
Mike
> ---
> drivers/clk/clk-wm831x.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clk/clk-wm831x.c b/drivers/clk/clk-wm831x.c
> index 16ed068..4bdf0b0 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,
> --
> 1.8.1.2
prev parent reply other threads:[~2013-05-29 6:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-01 15:31 [RFT][PATCH 1/2] clk: wm831x: Fix update wrong register for enable/disable FLL Axel Lin
2013-05-01 15:31 ` Axel Lin
2013-05-01 15:32 ` [RFT][PATCH 2/2] clk: wm831x: Fix wm831x_clkout_get_parent Axel Lin
2013-05-01 15:32 ` Axel Lin
2013-05-06 10:29 ` [RFT][PATCH 1/2] clk: wm831x: Fix update wrong register for enable/disable FLL Mark Brown
2013-05-06 10:29 ` Mark Brown
2013-05-29 6:51 ` Mike Turquette [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130529065119.6058.68188@quantum \
--to=mturquette@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.