clk: wm831x: Fix update wrong register for enable/disable FLL
Subsystems (2)
PATCH 1/2 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.
--- drivers/clk/clk-wm831x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clk/clk-wm831x.c +3 -3
@@ -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,
Signature · 1 line
1.8.1.2
PATCH 2/2 clk: wm831x: Fix wm831x_clkout_get_parent
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().
--- drivers/clk/clk-wm831x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clk/clk-wm831x.c +3 -3
@@ -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)
Signature · 1 line
1.8.1.2
Quoted 2 lines · Axel Lin
According to the datasheet, FLL Enable is controlled by R16530 (4092h) FLL Control1
Both
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130506/9a94a8a2/attachment.sig>
PATCH 1/2 clk: wm831x: Fix update wrong register for enable/disable FLL
In reply to Axel LinQuoting Axel Lin (2013-05-01 08:31:01)
Quoted 6 lines
According to the datasheet, FLL Enable is controlled by R16530 (4092h) FLL Control1
BIT 0: FLL Enable
0 = Disable
1 = Enable
Quoted 6 lines
Thus the code should update
WM831X_FLL_CONTROL_1register rather thanWM831X_FLL_CONTROL_2register.Also fixes a trivial typo in
dev_critmessage.Signed-off-by Axel Lin <[email protected]>
Pulled both into clk-next.
Thanks,
Mike
Quoted 31 lines
--- drivers/clk/clk-wm831x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/clk/clk-wm831x.c +3
-3@@ -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,Signature · 1 line
1.8.1.2