* [RFT][PATCH 1/2] clk: wm831x: Fix update wrong register for enable/disable FLL
@ 2013-05-01 15:31 ` Axel Lin
0 siblings, 0 replies; 7+ messages in thread
From: Axel Lin @ 2013-05-01 15:31 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFT][PATCH 2/2] clk: wm831x: Fix wm831x_clkout_get_parent
2013-05-01 15:31 ` Axel Lin
@ 2013-05-01 15:32 ` Axel Lin
-1 siblings, 0 replies; 7+ messages in thread
From: Axel Lin @ 2013-05-01 15:32 UTC (permalink / raw)
To: Mike Turquette; +Cc: Mark Brown, linux-arm-kernel, linux-kernel, patches
Current code looks strange because calling wm831x_clkout_set_parent() with 0 as
parent parameter, wm831x_clkout_get_parent() will return 1.
According to the datasheet:
R16528 (4090h) Clock Control1
BIT 0: CLKOUT output source select
0 = FLL output
1 = 32.768kHz oscillator
Thus fix the entry order in wm831x_clkout_parents[] to make it has
the same meaning as the datasheet and make the return value
of wm831x_clkout_get_parent() consistent with the parent pass to
wm831x_clkout_set_parent().
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
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 4bdf0b0..58d08a6 100644
--- a/drivers/clk/clk-wm831x.c
+++ b/drivers/clk/clk-wm831x.c
@@ -299,8 +299,8 @@ static void wm831x_clkout_unprepare(struct clk_hw *hw)
}
static const char *wm831x_clkout_parents[] = {
- "xtal",
"fll",
+ "xtal",
};
static u8 wm831x_clkout_get_parent(struct clk_hw *hw)
@@ -318,9 +318,9 @@ static u8 wm831x_clkout_get_parent(struct clk_hw *hw)
}
if (ret & WM831X_CLKOUT_SRC)
- return 0;
- else
return 1;
+ else
+ return 0;
}
static int wm831x_clkout_set_parent(struct clk_hw *hw, u8 parent)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFT][PATCH 2/2] clk: wm831x: Fix wm831x_clkout_get_parent
@ 2013-05-01 15:32 ` Axel Lin
0 siblings, 0 replies; 7+ messages in thread
From: Axel Lin @ 2013-05-01 15:32 UTC (permalink / raw)
To: linux-arm-kernel
Current code looks strange because calling wm831x_clkout_set_parent() with 0 as
parent parameter, wm831x_clkout_get_parent() will return 1.
According to the datasheet:
R16528 (4090h) Clock Control1
BIT 0: CLKOUT output source select
0 = FLL output
1 = 32.768kHz oscillator
Thus fix the entry order in wm831x_clkout_parents[] to make it has
the same meaning as the datasheet and make the return value
of wm831x_clkout_get_parent() consistent with the parent pass to
wm831x_clkout_set_parent().
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
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 4bdf0b0..58d08a6 100644
--- a/drivers/clk/clk-wm831x.c
+++ b/drivers/clk/clk-wm831x.c
@@ -299,8 +299,8 @@ static void wm831x_clkout_unprepare(struct clk_hw *hw)
}
static const char *wm831x_clkout_parents[] = {
- "xtal",
"fll",
+ "xtal",
};
static u8 wm831x_clkout_get_parent(struct clk_hw *hw)
@@ -318,9 +318,9 @@ static u8 wm831x_clkout_get_parent(struct clk_hw *hw)
}
if (ret & WM831X_CLKOUT_SRC)
- return 0;
- else
return 1;
+ else
+ return 0;
}
static int wm831x_clkout_set_parent(struct clk_hw *hw, u8 parent)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [RFT][PATCH 1/2] clk: wm831x: Fix update wrong register for enable/disable FLL
2013-05-01 15:31 ` Axel Lin
@ 2013-05-06 10:29 ` Mark Brown
-1 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2013-05-06 10:29 UTC (permalink / raw)
To: Axel Lin; +Cc: Mike Turquette, linux-arm-kernel, linux-kernel, patches
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
On Wed, May 01, 2013 at 11:31:01PM +0800, Axel Lin wrote:
> According to the datasheet, FLL Enable is controlled by
> R16530 (4092h) FLL Control1
Both
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [RFT][PATCH 1/2] clk: wm831x: Fix update wrong register for enable/disable FLL
2013-05-01 15:31 ` Axel Lin
` (2 preceding siblings ...)
(?)
@ 2013-05-29 6:51 ` Mike Turquette
-1 siblings, 0 replies; 7+ messages in thread
From: Mike Turquette @ 2013-05-29 6:51 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 7+ messages in thread