clk: implement remuxing during set_rate
Subsystems (13)
v3 cover clk: implement remuxing during set_rate
This patchset adds support for automatic selection of the best parent for a clock mux, i.e. the one which can provide the closest clock rate to that requested. It can be disabled by a new CLK_SET_RATE_NO_REPARENT flag (which is set for all uses of clk_register_mux().
This works by way of adding a new op, determine_rate, similar to round_rate but with an extra parameter to allow the clock driver to optionally select a different parent clock. This is used in clk_calc_new_rates to decide whether to initiate a set_parent operation.
Changes in v3:
* rebased on v3.10-rc1
* remove double underscore prefix from clk_get_parent_by_index()
* store new_parent_index in struct clk too (calculated from clk_fetch_parent_index, and passed through __clk_set_parent_no_recalc to __clk_set_parent).
* allow determine_rate to satisfy recalc_rate check in __clk_init.
* rename/invert CLK_SET_RATE_REMUX to CLK_SET_RATE_NO_REPARENT and move to patch 3.
* patch 3: add CLK_SET_RATE_NO_REPARENT flag to all callers of clk_register_mux. If you don't mind your clocks being reparented in response to set_rate please let me know and I'll drop the relevant portion of the patch.
Changes in v2:
I've moved the mux determine_rate implementation into a core helper, but I haven't pushed it fully into the core, as I think it just wouldn't work correctly for more complex clocks, e.g. if you (theoretically) had a combined mux and divide, you'd want to intercept the determine_rate and ask for a larger rate from the parent clocks, then return the divided rate. This should be possible by wrapping the mux determine_rate helper.
Patch 1 still exports the __clk_get_parent_by_index as it seems like it might be a useful thing for clock implementations to have access to if they ever wanted to do something more fancy with changing clock parents.
I haven't made any attempt to implement the atomic set_parent+set_rate as I don't have hardware that could take proper advantage of it, but it shouldn't be too difficult for others to implement if they wanted since they're fairly close to one another (in clk_change_rate()).
* switched to using new determine_rate op rather than adding an argument to round_rate.
* moved mux implementation into a single helper which should be usable from more complex clocks which can mux.
* rewrite main implementation so that no changes are made until after the PRE notifications have been sent, and in a way that should ensure correct notifications without duplicates, and I think should be safe in the event of a notification failing.
* various tidy ups and fixes.
James Hogan (4):
clk: abstract parent cache
clk: add support for clock reparent on set_rate
clk: add CLK_SET_RATE_NO_REPARENT flag
clk: clk-mux: implement remuxing on set_rate
Documentation/clk.txt | 4 + arch/arm/mach-imx/clk.h | 5 +- drivers/clk/clk-mux.c | 1 + drivers/clk/clk.c | 278 +++++++++++++++++++++++++---------- drivers/clk/mmp/clk-mmp2.c | 39 +++-- drivers/clk/mmp/clk-pxa168.c | 40 +++-- drivers/clk/mmp/clk-pxa910.c | 31 ++-- drivers/clk/mxs/clk.h | 4 +- drivers/clk/samsung/clk.h | 2 +- drivers/clk/spear/spear1310_clock.c | 179 +++++++++++----------- drivers/clk/spear/spear1340_clock.c | 97 ++++++------ drivers/clk/spear/spear3xx_clock.c | 57 ++++--- drivers/clk/spear/spear6xx_clock.c | 35 +++-- drivers/clk/sunxi/clk-sunxi.c | 3 +- drivers/clk/tegra/clk-tegra114.c | 36 +++-- drivers/clk/tegra/clk-tegra20.c | 6 +- drivers/clk/tegra/clk-tegra30.c | 33 +++-- drivers/clk/versatile/clk-vexpress.c | 4 +- include/linux/clk-private.h | 3 + include/linux/clk-provider.h | 12 ++ 20 files changed, 556 insertions(+), 313 deletions(-)
Signature · 1 line
1.8.1.2
PATCH v3 1/4 clk: abstract parent cache
Abstract access to the clock parent cache by defining clk_get_parent_by_index(clk, index). This allows access to parent clocks from clock drivers.
---
Changes in v3:
* remove double underscore prefix from clk_get_parent_by_index()
drivers/clk/clk.c | 21 ++++++++++++++------- include/linux/clk-provider.h | 1 + 2 files changed, 15 insertions(+), 7 deletions(-)
drivers/clk/clk.c +14 -7
@@ -559,6 +559,19 @@ struct clk *__clk_get_parent(struct clk *clk)return !clk ?NULL : clk->parent; } +struct clk *clk_get_parent_by_index (struct clk *clk,u8 index) +{ +if (!clk || index >= clk->num_parents) +return NULL ; +else if (!clk->parents) +return __clk_lookup (clk->parent_names[index]); +else if (!clk->parents[index]) +return clk->parents[index] = +__clk_lookup (clk->parent_names[index]); +else +return clk->parents[index]; +} +unsigned int __clk_get_enable_count (struct clk *clk) {return !clk ?0 : clk->enable_count;
@@ -1315,13 +1328,7 @@ static struct clk *__clk_init_parent(struct clk *clk)kzalloc ((sizeof (struct clk *) * clk->num_parents),GFP_KERNEL ); -if (!clk->parents) - ret =__clk_lookup (clk->parent_names[index]); -else if (!clk->parents[index]) - ret = clk->parents[index] = -__clk_lookup (clk->parent_names[index]); -else - ret = clk->parents[index]; + ret =clk_get_parent_by_index (clk, index); out:return ret;
include/linux/clk-provider.h +1 -0
@@ -403,6 +403,7 @@ const char *__clk_get_name(struct clk *clk);struct clk_hw *__clk_get_hw (struct clk *clk);u8 __clk_get_num_parents (struct clk *clk);struct clk *__clk_get_parent (struct clk *clk); +struct clk *clk_get_parent_by_index (struct clk *clk,u8 index);unsigned int __clk_get_enable_count (struct clk *clk);unsigned int __clk_get_prepare_count (struct clk *clk);unsigned long __clk_get_rate (struct clk *clk);
Signature · 1 line
1.8.1.2
PATCH v3 1/4 clk: abstract parent cache
Quoted 7 lines · James Hogan
Abstract access to the clock parent cache by defining
clk_get_parent_by_index(clk, index). This allows access to parent clocks from clock drivers.Signed-off-by James Hogan <[email protected]>Cc Mike Turquette <[email protected]>Cc linux-arm-kernel at lists.infradead.org
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 2/4 clk: add support for clock reparent on set_rate
In reply to James HoganAdd core support to allow clock implementations to select the best parent clock when rounding a rate, e.g. the one which can provide the closest clock rate to that requested. This is by way of adding a new clock op, determine_rate(), which is like round_rate() but has an extra parameter to allow the clock implementation to optionally select a different parent clock. The core then takes care of reparenting the clock when setting the rate.
The parent change takes place with the help of two new private data members. struct clk::new_parent specifies a clock's new parent (NULL indicates no change), and struct clk::new_child specifies a clock's new child (whose new_parent member points back to it). The purpose of these are to allow correct walking of the future tree for notifications prior to actually reparenting any clocks, specifically to skip child clocks who are being reparented to another clock (they will be notified via the new parent), and to include any new child clock. These pointers are set by clk_calc_subtree(), and the new_child pointer gets cleared when a child is actually reparented to avoid duplicate POST_RATE_CHANGE notifications.
Each place where round_rate() is called, determine_rate is checked first and called in preference, passing NULL to the new parent argument if not needed (e.g. in __clk_round_rate). This restructures a few of the call sites to simplify the logic into if/else blocks.
A new __clk_set_parent_no_recalc() is created similar to clk_set_parent() but without calling __clk_recalc_rates(). This is for clk_change_rate() to use, where rate recalculation and notifications are already handled.
---
Changes in v3:
* rebased on v3.10-rc1
* store new_parent_index in struct clk too (calculated from clk_fetch_parent_index, and passed through __clk_set_parent_no_recalc to __clk_set_parent).
* allow determine_rate to satisfy recalc_rate check in __clk_init.
Documentation/clk.txt | 4 + drivers/clk/clk.c | 208 +++++++++++++++++++++++++++++-------------- include/linux/clk-private.h | 3 + include/linux/clk-provider.h | 7 ++ 4 files changed, 154 insertions(+), 68 deletions(-)
Documentation/clk.txt +4 -0
@@ -70,6 +70,10 @@ the operations defined in clk.h: unsigned long parent_rate); long (*round_rate)(struct clk_hw *hw, unsigned long, unsigned long *); + long (*determine_rate)(struct clk_hw *hw, + unsigned long rate, + unsigned long *best_parent_rate, + struct clk **best_parent_clk); int (*set_parent)(struct clk_hw *hw, u8 index); u8 (*get_parent)(struct clk_hw *hw); int (*set_rate)(struct clk_hw *hw, unsigned long);
drivers/clk/clk.c +140 -68
319 lines not on this page · raw message
include/linux/clk-private.h +3 -0
@@ -33,8 +33,11 @@ struct clk {const char **parent_names;struct clk **parents;u8 num_parents; +u8 new_parent_index;unsigned long rate;unsigned long new_rate; +struct clk *new_parent; +struct clk *new_child;unsigned long flags;unsigned int enable_count;unsigned int prepare_count;
include/linux/clk-provider.h +7 -0
@@ -79,6 +79,10 @@ struct clk_hw;* @round_rate: Given a target rate as input, returns the closest rate actually * supported by the clock. * +* @determine_rate: Given a target rate as input, returns the closest rate +* actually supported by the clock, and optionally the parent clock +* that should be used to provide the clock rate. +* * @get_parent: Queries the hardware to determine the parent of a clock. The * return value is a u8 which specifies the index corresponding to * the parent clock. This index can be applied to either the
@@ -126,6 +130,9 @@ struct clk_ops { unsigned long parent_rate);long (*round_rate)(struct clk_hw *hw,unsigned long ,unsigned long *); +long (*determine_rate)(struct clk_hw *hw,unsigned long rate, +unsigned long *best_parent_rate, +struct clk **best_parent_clk);int (*set_parent)(struct clk_hw *hw,u8 index);u8 (*get_parent)(struct clk_hw *hw); int (*set_rate)(struct clk_hw *hw, unsigned long,
Signature · 1 line
1.8.1.2
PATCH v3 2/4 clk: add support for clock reparent on set_rate
Quoted 20 lines · James Hogan
Add core support to allow clock implementations to select the best parent clock when rounding a rate, e.g. the one which can provide the closest clock rate to that requested. This is by way of adding a new clock op,
determine_rate(), which is likeround_rate()but has an extra parameter to allow the clock implementation to optionally select a different parent clock. The core then takes care of reparenting the clock when setting the rate.The parent change takes place with the help of two new private data members. struct
clk::new_parentspecifies a clock's new parent (NULL indicates no change), and structclk::new_childspecifies a clock's new child (whosenew_parentmember points back to it). The purpose of these are to allow correct walking of the future tree for notifications prior to actually reparenting any clocks, specifically to skip child clocks who are being reparented to another clock (they will be notified via the new parent), and to include any new child clock. These pointers are set byclk_calc_subtree(), and thenew_childpointer gets cleared when a child is actually reparented to avoid duplicatePOST_RATE_CHANGEnotifications.
Quoted 3 lines
Each place where
round_rate()is called,determine_rateis checked first and called in preference, passing NULL to the new parent argument if not needed (e.g. in__clk_round_rate).
That's annoying. Even if we don't care about the pointer in clk_round_rate(), this requires the ops to check for NULL before assigning the pointer. Why not just pass an unused pointer that the ops can assign all the time?
Quoted 11 lines
This restructures a few of the call
sites to simplify the logic into if/else blocks.A new
__clk_set_parent_no_recalc()is created similar toclk_set_parent()but without calling__clk_recalc_rates(). This is forclk_change_rate()to use, where rate recalculation and notifications are already handled.Signed-off-by James Hogan <[email protected]>Cc Mike Turquette <[email protected]>Cc linux-arm-kernel at lists.infradead.org
With the above change you can add
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 2/4 clk: add support for clock reparent on set_rate
Quoted 9 lines · Stephen Boyd
Quoted 3 lines · James Hogan
Each place where
round_rate()is called,determine_rateis checked first and called in preference, passing NULL to the new parent argument if not needed (e.g. in__clk_round_rate).That's annoying. Even if we don't care about the pointer in
clk_round_rate(), this requires the ops to check for NULL before assigning the pointer. Why not just pass an unused pointer that the ops can assign all the time?
True, I'll fix that.
Quoted 3 lines
With the above change you can add
Reviewed-by Stephen Boyd <[email protected]>
Thanks for taking the time to review it.
Cheers
James
PATCH v3 2/4 clk: add support for clock reparent on set_rate
In reply to James HoganNoticed another minor thing. I'm working on the set rate and parent at the same time op on top of this patch series. Hopefully have something soon.
drivers/clk/clk.c static void clk_change_rate(struct clk *clk) · line 1249
Quoted 9 lines · James Hogan
drivers/clk/clk.c +5
-0@@ -1181,6 +1242,11 @@ static void clk_change_rate(struct clk *clk) old_rate = clk->rate; +/* set parent */ +if (clk->new_parent && clk->new_parent != clk->parent) +__clk_set_parent_no_recalc (clk, clk->new_parent, + clk->new_parent_index); +
This check here for new_parent != clk->parent ...
drivers/clk/clk.c static int __clk_set_parent(struct clk *clk, struct clk *parent, u8 p_index) · line 1510
Quoted 11 lines
drivers/clk/clk.c +7
-0@@ -1451,6 +1501,27 @@ static int __clk_set_parent(struct clk *clk, struct clk *parent, u8 p_index)return 0 ; } +static int __clk_set_parent_no_recalc (struct clk *clk,struct clk *parent, +u8 p_index) +{ +int ret =0 ; + +if (clk->parent == parent) + goto out;
causes this to never be true, so we can probably drop it.
drivers/clk/clk.c static int __clk_set_parent(struct clk *clk, struct clk *parent, u8 p_index) · line 1523
Quoted 13 lines
drivers/clk/clk.c +13
-0+ +/* only re-parent if the clock is not in use */ + ret =__clk_set_parent (clk, parent, p_index); +if (ret) + goto out; + +/* reparent, but don't propagate rate recalculation downstream */ +clk_reparent (clk, parent); +clk_debug_reparent (clk, parent); + +out: +return ret; +}
Also, we never check the return code so it's sort of useless.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 2/4 clk: add support for clock reparent on set_rate
Quoted 31 lines · Stephen Boyd
Noticed another minor thing. I'm working on the set rate and parent at the same time op on top of this patch series. Hopefully have something soon.
drivers/clk/clk.c static void clk_change_rate(struct clk *clk) · line 1249
Quoted 9 lines · James Hogan
drivers/clk/clk.c +5
-0@@ -1181,6 +1242,11 @@ static void clk_change_rate(struct clk *clk) old_rate = clk->rate; +/* set parent */ +if (clk->new_parent && clk->new_parent != clk->parent) +__clk_set_parent_no_recalc (clk, clk->new_parent, + clk->new_parent_index); +This check here for
new_parent!=clk->parent...drivers/clk/clk.c static int __clk_set_parent(struct clk *clk, struct clk *parent, u8 p_index) · line 1510
Quoted 11 lines
drivers/clk/clk.c +7
-0@@ -1451,6 +1501,27 @@ static int __clk_set_parent(struct clk *clk, struct clk *parent, u8 p_index)return 0 ; } +static int __clk_set_parent_no_recalc (struct clk *clk,struct clk *parent, +u8 p_index) +{ +int ret =0 ; + +if (clk->parent == parent) + goto out;causes this to never be true, so we can probably drop it.
Quoted 16 lines
drivers/clk/clk.c static int __clk_set_parent(struct clk *clk, struct clk *parent, u8 p_index) · line 1523
Quoted 13 lines
drivers/clk/clk.c +13
-0+ +/* only re-parent if the clock is not in use */ + ret =__clk_set_parent (clk, parent, p_index); +if (ret) + goto out; + +/* reparent, but don't propagate rate recalculation downstream */ +clk_reparent (clk, parent); +clk_debug_reparent (clk, parent); + +out: +return ret; +}Also, we never check the return code so it's sort of useless.
Hi Stephen,
Well spotted, and as you pointed it privately it can use __clk_set_parent() instead of __clk_set_parent_no_recalc() now :)
Thanks
James
PATCH v3 3/4 clk: add CLK_SET_RATE_NO_REPARENT flag
In reply to James HoganAdd a CLK_SET_RATE_NO_REPARENT clock flag, which will prevent muxes being reparented during clk_set_rate.
To avoid breaking existing platforms, all callers of clk_register_mux() are adjusted to pass the new flag. Platform maintainers are encouraged to remove the flag if they wish to allow mux reparenting on set_rate.
---
Changes in v3:
* rename/invert CLK_SET_RATE_REMUX to CLK_SET_RATE_NO_REPARENT and move to this new patch.
* patch 3: add CLK_SET_RATE_NO_REPARENT flag to all callers of clk_register_mux. If you don't mind your clocks being reparented in response to set_rate please let me know and I'll drop the relevant portion of the patch.
arch/arm/mach-imx/clk.h | 5 +- drivers/clk/mmp/clk-mmp2.c | 39 +++++--- drivers/clk/mmp/clk-pxa168.c | 40 +++++--- drivers/clk/mmp/clk-pxa910.c | 31 +++--- drivers/clk/mxs/clk.h | 4 +- drivers/clk/samsung/clk.h | 2 +- drivers/clk/spear/spear1310_clock.c | 179 ++++++++++++++++++----------------- drivers/clk/spear/spear1340_clock.c | 97 ++++++++++--------- drivers/clk/spear/spear3xx_clock.c | 57 +++++++---- drivers/clk/spear/spear6xx_clock.c | 35 +++---- drivers/clk/sunxi/clk-sunxi.c | 3 +- drivers/clk/tegra/clk-tegra114.c | 36 ++++--- drivers/clk/tegra/clk-tegra20.c | 6 +- drivers/clk/tegra/clk-tegra30.c | 33 ++++--- drivers/clk/versatile/clk-vexpress.c | 4 +- include/linux/clk-provider.h | 1 + 16 files changed, 334 insertions(+), 238 deletions(-)
arch/arm/mach-imx/clk.h +3 -2
@@ -77,7 +77,8 @@ static inline struct clk *imx_clk_gate(const char *name, const char *parent,static inline struct clk *imx_clk_mux (const char *name,void __iomem *reg,u8 shift,u8 width,const char **parents,int num_parents) { -return clk_register_mux (NULL , name, parents, num_parents,0 , reg, shift, +return clk_register_mux (NULL , name, parents, num_parents, +CLK_SET_RATE_NO_REPARENT , reg, shift, width,0 , &imx_ccm_lock); }
@@ -86,7 +87,7 @@ static inline struct clk *imx_clk_mux_flags(const char *name, int num_parents, unsigned long flags) {return clk_register_mux (NULL , name, parents, num_parents, - flags, reg, shift, width,0 , + flags |CLK_SET_RATE_NO_REPARENT , reg, shift, width,0 , &imx_ccm_lock); }
drivers/clk/mmp/clk-mmp2.c +26 -13
@@ -248,7 +248,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,NULL ,"mmp2-pwm.3" ); clk =clk_register_mux (NULL ,"uart0_mux" , uart_parent, -ARRAY_SIZE (uart_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (uart_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_UART0 ,4 ,3 ,0 , &clk_lock);clk_set_parent (clk, vctcxo);clk_register_clkdev (clk,"uart_mux.0" ,NULL );
@@ -258,7 +259,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa2xx-uart.0" ); clk =clk_register_mux (NULL ,"uart1_mux" , uart_parent, -ARRAY_SIZE (uart_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (uart_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_UART1 ,4 ,3 ,0 , &clk_lock);clk_set_parent (clk, vctcxo);clk_register_clkdev (clk,"uart_mux.1" ,NULL );
@@ -268,7 +270,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa2xx-uart.1" ); clk =clk_register_mux (NULL ,"uart2_mux" , uart_parent, -ARRAY_SIZE (uart_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (uart_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_UART2 ,4 ,3 ,0 , &clk_lock);clk_set_parent (clk, vctcxo);clk_register_clkdev (clk,"uart_mux.2" ,NULL );
@@ -278,7 +281,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa2xx-uart.2" ); clk =clk_register_mux (NULL ,"uart3_mux" , uart_parent, -ARRAY_SIZE (uart_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (uart_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_UART3 ,4 ,3 ,0 , &clk_lock);clk_set_parent (clk, vctcxo);clk_register_clkdev (clk,"uart_mux.3" ,NULL );
@@ -288,7 +292,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa2xx-uart.3" ); clk =clk_register_mux (NULL ,"ssp0_mux" , ssp_parent, -ARRAY_SIZE (ssp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ssp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_SSP0 ,4 ,3 ,0 , &clk_lock);clk_register_clkdev (clk,"uart_mux.0" ,NULL );
@@ -297,7 +302,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,NULL ,"mmp-ssp.0" ); clk =clk_register_mux (NULL ,"ssp1_mux" , ssp_parent, -ARRAY_SIZE (ssp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ssp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_SSP1 ,4 ,3 ,0 , &clk_lock);clk_register_clkdev (clk,"ssp_mux.1" ,NULL );
@@ -306,7 +312,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,NULL ,"mmp-ssp.1" ); clk =clk_register_mux (NULL ,"ssp2_mux" , ssp_parent, -ARRAY_SIZE (ssp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ssp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_SSP2 ,4 ,3 ,0 , &clk_lock);clk_register_clkdev (clk,"ssp_mux.2" ,NULL );
@@ -315,7 +322,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,NULL ,"mmp-ssp.2" ); clk =clk_register_mux (NULL ,"ssp3_mux" , ssp_parent, -ARRAY_SIZE (ssp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ssp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_SSP3 ,4 ,3 ,0 , &clk_lock);clk_register_clkdev (clk,"ssp_mux.3" ,NULL );
@@ -324,7 +332,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,NULL ,"mmp-ssp.3" ); clk =clk_register_mux (NULL ,"sdh_mux" , sdh_parent, -ARRAY_SIZE (sdh_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (sdh_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_SDH0 ,8 ,2 ,0 , &clk_lock);clk_register_clkdev (clk,"sdh_mux" ,NULL );
@@ -354,7 +363,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,"usb_clk" ,NULL ); clk =clk_register_mux (NULL ,"disp0_mux" , disp_parent, -ARRAY_SIZE (disp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (disp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_DISP0 ,6 ,2 ,0 , &clk_lock);clk_register_clkdev (clk,"disp_mux.0" ,NULL );
@@ -376,7 +386,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,"disp_sphy.0" ,NULL ); clk =clk_register_mux (NULL ,"disp1_mux" , disp_parent, -ARRAY_SIZE (disp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (disp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_DISP1 ,6 ,2 ,0 , &clk_lock);clk_register_clkdev (clk,"disp_mux.1" ,NULL );
@@ -394,7 +405,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,"ccic_arbiter" ,NULL ); clk =clk_register_mux (NULL ,"ccic0_mux" , ccic_parent, -ARRAY_SIZE (ccic_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ccic_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_CCIC0 ,6 ,2 ,0 , &clk_lock);clk_register_clkdev (clk,"ccic_mux.0" ,NULL );
@@ -421,7 +433,8 @@ void __init mmp2_clk_init(void)clk_register_clkdev (clk,"sphyclk" ,"mmp-ccic.0" ); clk =clk_register_mux (NULL ,"ccic1_mux" , ccic_parent, -ARRAY_SIZE (ccic_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ccic_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_CCIC1 ,6 ,2 ,0 , &clk_lock);clk_register_clkdev (clk,"ccic_mux.1" ,NULL );
drivers/clk/mmp/clk-pxa168.c +26 -14
@@ -199,7 +199,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa168-pwm.3" ); clk =clk_register_mux (NULL ,"uart0_mux" , uart_parent, -ARRAY_SIZE (uart_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (uart_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_UART0 ,4 ,3 ,0 , &clk_lock);clk_set_parent (clk, uart_pll);clk_register_clkdev (clk,"uart_mux.0" ,NULL );
@@ -209,7 +210,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa2xx-uart.0" ); clk =clk_register_mux (NULL ,"uart1_mux" , uart_parent, -ARRAY_SIZE (uart_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (uart_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_UART1 ,4 ,3 ,0 , &clk_lock);clk_set_parent (clk, uart_pll);clk_register_clkdev (clk,"uart_mux.1" ,NULL );
@@ -219,7 +221,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa2xx-uart.1" ); clk =clk_register_mux (NULL ,"uart2_mux" , uart_parent, -ARRAY_SIZE (uart_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (uart_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_UART2 ,4 ,3 ,0 , &clk_lock);clk_set_parent (clk, uart_pll);clk_register_clkdev (clk,"uart_mux.2" ,NULL );
@@ -229,7 +232,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa2xx-uart.2" ); clk =clk_register_mux (NULL ,"ssp0_mux" , ssp_parent, -ARRAY_SIZE (ssp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ssp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_SSP0 ,4 ,3 ,0 , &clk_lock);clk_register_clkdev (clk,"uart_mux.0" ,NULL );
@@ -238,7 +242,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,NULL ,"mmp-ssp.0" ); clk =clk_register_mux (NULL ,"ssp1_mux" , ssp_parent, -ARRAY_SIZE (ssp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ssp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_SSP1 ,4 ,3 ,0 , &clk_lock);clk_register_clkdev (clk,"ssp_mux.1" ,NULL );
@@ -247,7 +252,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,NULL ,"mmp-ssp.1" ); clk =clk_register_mux (NULL ,"ssp2_mux" , ssp_parent, -ARRAY_SIZE (ssp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ssp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_SSP2 ,4 ,3 ,0 , &clk_lock);clk_register_clkdev (clk,"ssp_mux.2" ,NULL );
@@ -256,7 +262,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,NULL ,"mmp-ssp.2" ); clk =clk_register_mux (NULL ,"ssp3_mux" , ssp_parent, -ARRAY_SIZE (ssp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ssp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_SSP3 ,4 ,3 ,0 , &clk_lock);clk_register_clkdev (clk,"ssp_mux.3" ,NULL );
@@ -265,7 +272,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,NULL ,"mmp-ssp.3" ); clk =clk_register_mux (NULL ,"ssp4_mux" , ssp_parent, -ARRAY_SIZE (ssp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ssp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_SSP4 ,4 ,3 ,0 , &clk_lock);clk_register_clkdev (clk,"ssp_mux.4" ,NULL );
@@ -278,7 +286,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa3xx-nand.0" ); clk =clk_register_mux (NULL ,"sdh0_mux" , sdh_parent, -ARRAY_SIZE (sdh_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (sdh_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_SDH0 ,6 ,1 ,0 , &clk_lock);clk_register_clkdev (clk,"sdh0_mux" ,NULL );
@@ -287,7 +296,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,NULL ,"sdhci-pxa.0" ); clk =clk_register_mux (NULL ,"sdh1_mux" , sdh_parent, -ARRAY_SIZE (sdh_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (sdh_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_SDH1 ,6 ,1 ,0 , &clk_lock);clk_register_clkdev (clk,"sdh1_mux" ,NULL );
@@ -304,7 +314,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,"sph_clk" ,NULL ); clk =clk_register_mux (NULL ,"disp0_mux" , disp_parent, -ARRAY_SIZE (disp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (disp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_DISP0 ,6 ,1 ,0 , &clk_lock);clk_register_clkdev (clk,"disp_mux.0" ,NULL );
@@ -317,7 +328,8 @@ void __init pxa168_clk_init(void)clk_register_clkdev (clk,"hclk" ,"mmp-disp.0" ); clk =clk_register_mux (NULL ,"ccic0_mux" , ccic_parent, -ARRAY_SIZE (ccic_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ccic_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_CCIC0 ,6 ,1 ,0 , &clk_lock);clk_register_clkdev (clk,"ccic_mux.0" ,NULL );
@@ -327,8 +339,8 @@ void __init pxa168_clk_init(void) clk =clk_register_mux (NULL ,"ccic0_phy_mux" , ccic_phy_parent,ARRAY_SIZE (ccic_phy_parent), -CLK_SET_RATE_PARENT , apmu_base +APMU_CCIC0 , -7 ,1 ,0 , &clk_lock); +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , + apmu_base +APMU_CCIC0 ,7 ,1 ,0 , &clk_lock);clk_register_clkdev (clk,"ccic_phy_mux.0" ,NULL ); clk = mmp_clk_register_apmu("ccic0_phy", "ccic0_phy_mux",
drivers/clk/mmp/clk-pxa910.c +20 -11
@@ -204,7 +204,8 @@ void __init pxa910_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa910-pwm.3" ); clk =clk_register_mux (NULL ,"uart0_mux" , uart_parent, -ARRAY_SIZE (uart_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (uart_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_UART0 ,4 ,3 ,0 , &clk_lock);clk_set_parent (clk, uart_pll);clk_register_clkdev (clk,"uart_mux.0" ,NULL );
@@ -214,7 +215,8 @@ void __init pxa910_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa2xx-uart.0" ); clk =clk_register_mux (NULL ,"uart1_mux" , uart_parent, -ARRAY_SIZE (uart_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (uart_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_UART1 ,4 ,3 ,0 , &clk_lock);clk_set_parent (clk, uart_pll);clk_register_clkdev (clk,"uart_mux.1" ,NULL );
@@ -224,7 +226,8 @@ void __init pxa910_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa2xx-uart.1" ); clk =clk_register_mux (NULL ,"uart2_mux" , uart_parent, -ARRAY_SIZE (uart_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (uart_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbcp_base +APBCP_UART2 ,4 ,3 ,0 , &clk_lock);clk_set_parent (clk, uart_pll);clk_register_clkdev (clk,"uart_mux.2" ,NULL );
@@ -234,7 +237,8 @@ void __init pxa910_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa2xx-uart.2" ); clk =clk_register_mux (NULL ,"ssp0_mux" , ssp_parent, -ARRAY_SIZE (ssp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ssp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_SSP0 ,4 ,3 ,0 , &clk_lock);clk_register_clkdev (clk,"uart_mux.0" ,NULL );
@@ -243,7 +247,8 @@ void __init pxa910_clk_init(void)clk_register_clkdev (clk,NULL ,"mmp-ssp.0" ); clk =clk_register_mux (NULL ,"ssp1_mux" , ssp_parent, -ARRAY_SIZE (ssp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ssp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apbc_base +APBC_SSP1 ,4 ,3 ,0 , &clk_lock);clk_register_clkdev (clk,"ssp_mux.1" ,NULL );
@@ -256,7 +261,8 @@ void __init pxa910_clk_init(void)clk_register_clkdev (clk,NULL ,"pxa3xx-nand.0" ); clk =clk_register_mux (NULL ,"sdh0_mux" , sdh_parent, -ARRAY_SIZE (sdh_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (sdh_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_SDH0 ,6 ,1 ,0 , &clk_lock);clk_register_clkdev (clk,"sdh0_mux" ,NULL );
@@ -265,7 +271,8 @@ void __init pxa910_clk_init(void)clk_register_clkdev (clk,NULL ,"sdhci-pxa.0" ); clk =clk_register_mux (NULL ,"sdh1_mux" , sdh_parent, -ARRAY_SIZE (sdh_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (sdh_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_SDH1 ,6 ,1 ,0 , &clk_lock);clk_register_clkdev (clk,"sdh1_mux" ,NULL );
@@ -282,7 +289,8 @@ void __init pxa910_clk_init(void)clk_register_clkdev (clk,"sph_clk" ,NULL ); clk =clk_register_mux (NULL ,"disp0_mux" , disp_parent, -ARRAY_SIZE (disp_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (disp_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_DISP0 ,6 ,1 ,0 , &clk_lock);clk_register_clkdev (clk,"disp_mux.0" ,NULL );
@@ -291,7 +299,8 @@ void __init pxa910_clk_init(void)clk_register_clkdev (clk,NULL ,"mmp-disp.0" ); clk =clk_register_mux (NULL ,"ccic0_mux" , ccic_parent, -ARRAY_SIZE (ccic_parent),CLK_SET_RATE_PARENT , +ARRAY_SIZE (ccic_parent), +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , apmu_base +APMU_CCIC0 ,6 ,1 ,0 , &clk_lock);clk_register_clkdev (clk,"ccic_mux.0" ,NULL );
@@ -301,8 +310,8 @@ void __init pxa910_clk_init(void) clk =clk_register_mux (NULL ,"ccic0_phy_mux" , ccic_phy_parent,ARRAY_SIZE (ccic_phy_parent), -CLK_SET_RATE_PARENT , apmu_base +APMU_CCIC0 , -7 ,1 ,0 , &clk_lock); +CLK_SET_RATE_PARENT |CLK_SET_RATE_NO_REPARENT , + apmu_base +APMU_CCIC0 ,7 ,1 ,0 , &clk_lock);clk_register_clkdev (clk,"ccic_phy_mux.0" ,NULL ); clk = mmp_clk_register_apmu("ccic0_phy", "ccic0_phy_mux",
drivers/clk/mxs/clk.h +2 -2
@@ -52,8 +52,8 @@ static inline struct clk *mxs_clk_mux(const char *name, void __iomem *reg, u8 shift, u8 width, const char **parent_names, int num_parents) { return clk_register_mux(NULL, name, parent_names, num_parents, -CLK_SET_RATE_PARENT ,reg ,shift ,width , - 0, &mxs_lock); + CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, + reg, shift, width, 0, &mxs_lock); } static inline struct clk *mxs_clk_fixed_factor(const char *name,
drivers/clk/samsung/clk.h +1 -1
@@ -127,7 +127,7 @@ struct samsung_mux_clock { .name = cname, \ .parent_names = pnames, \ .num_parents = ARRAY_SIZE(pnames), \ - .flags = f, \ + .flags = (f) | CLK_SET_RATE_NO_REPARENT, \ .offset = o, \ .shift = s, \ .width = w, \
drivers/clk/spear/spear1310_clock.c +93 -86
387 lines not on this page · raw message
drivers/clk/spear/spear1340_clock.c +53 -44
228 lines not on this page · raw message
drivers/clk/spear/spear3xx_clock.c +36 -21
152 lines not on this page · raw message
drivers/clk/spear/spear6xx_clock.c +19 -16
@@ -169,8 +169,9 @@ void __init spear6xx_clk_init(void __iomem *misc_base)clk_register_clkdev (clk1,"uart_syn_gclk" ,NULL ); clk =clk_register_mux (NULL ,"uart_mclk" , uart_parents, -ARRAY_SIZE (uart_parents),0 ,PERIP_CLK_CFG , -UART_CLK_SHIFT ,UART_CLK_MASK ,0 , &_lock); +ARRAY_SIZE (uart_parents),CLK_SET_RATE_NO_REPARENT , +PERIP_CLK_CFG ,UART_CLK_SHIFT ,UART_CLK_MASK ,0 , + &_lock);clk_register_clkdev (clk,"uart_mclk" ,NULL ); clk = clk_register_gate(NULL, "uart0", "uart_mclk", 0, PERIP1_CLK_ENB,
@@ -188,8 +189,9 @@ void __init spear6xx_clk_init(void __iomem *misc_base)clk_register_clkdev (clk1,"firda_syn_gclk" ,NULL ); clk =clk_register_mux (NULL ,"firda_mclk" , firda_parents, -ARRAY_SIZE (firda_parents),0 ,PERIP_CLK_CFG , -FIRDA_CLK_SHIFT ,FIRDA_CLK_MASK ,0 , &_lock); +ARRAY_SIZE (firda_parents),CLK_SET_RATE_NO_REPARENT , +PERIP_CLK_CFG ,FIRDA_CLK_SHIFT ,FIRDA_CLK_MASK ,0 , + &_lock);clk_register_clkdev (clk,"firda_mclk" ,NULL ); clk = clk_register_gate(NULL, "firda_clk", "firda_mclk", 0,
@@ -203,8 +205,9 @@ void __init spear6xx_clk_init(void __iomem *misc_base)clk_register_clkdev (clk1,"clcd_syn_gclk" ,NULL ); clk =clk_register_mux (NULL ,"clcd_mclk" , clcd_parents, -ARRAY_SIZE (clcd_parents),0 ,PERIP_CLK_CFG , -CLCD_CLK_SHIFT ,CLCD_CLK_MASK ,0 , &_lock); +ARRAY_SIZE (clcd_parents),CLK_SET_RATE_NO_REPARENT , +PERIP_CLK_CFG ,CLCD_CLK_SHIFT ,CLCD_CLK_MASK ,0 , + &_lock);clk_register_clkdev (clk,"clcd_mclk" ,NULL ); clk = clk_register_gate(NULL, "clcd_clk", "clcd_mclk", 0,
@@ -217,13 +220,13 @@ void __init spear6xx_clk_init(void __iomem *misc_base)clk_register_clkdev (clk,"gpt0_1_syn_clk" ,NULL ); clk =clk_register_mux (NULL ,"gpt0_mclk" , gpt0_1_parents, -ARRAY_SIZE (gpt0_1_parents),0 ,PERIP_CLK_CFG , -GPT0_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock); +ARRAY_SIZE (gpt0_1_parents),CLK_SET_RATE_NO_REPARENT , +PERIP_CLK_CFG ,GPT0_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt0" ); clk =clk_register_mux (NULL ,"gpt1_mclk" , gpt0_1_parents, -ARRAY_SIZE (gpt0_1_parents),0 ,PERIP_CLK_CFG , -GPT1_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock); +ARRAY_SIZE (gpt0_1_parents),CLK_SET_RATE_NO_REPARENT , +PERIP_CLK_CFG ,GPT1_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,"gpt1_mclk" ,NULL ); clk = clk_register_gate(NULL, "gpt1_clk", "gpt1_mclk", 0,
@@ -235,8 +238,8 @@ void __init spear6xx_clk_init(void __iomem *misc_base)clk_register_clkdev (clk,"gpt2_syn_clk" ,NULL ); clk =clk_register_mux (NULL ,"gpt2_mclk" , gpt2_parents, -ARRAY_SIZE (gpt2_parents),0 ,PERIP_CLK_CFG , -GPT2_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock); +ARRAY_SIZE (gpt2_parents),CLK_SET_RATE_NO_REPARENT , +PERIP_CLK_CFG ,GPT2_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,"gpt2_mclk" ,NULL ); clk = clk_register_gate(NULL, "gpt2_clk", "gpt2_mclk", 0,
@@ -248,8 +251,8 @@ void __init spear6xx_clk_init(void __iomem *misc_base)clk_register_clkdev (clk,"gpt3_syn_clk" ,NULL ); clk =clk_register_mux (NULL ,"gpt3_mclk" , gpt3_parents, -ARRAY_SIZE (gpt3_parents),0 ,PERIP_CLK_CFG , -GPT3_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock); +ARRAY_SIZE (gpt3_parents),CLK_SET_RATE_NO_REPARENT , +PERIP_CLK_CFG ,GPT3_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,"gpt3_mclk" ,NULL ); clk = clk_register_gate(NULL, "gpt3_clk", "gpt3_mclk", 0,
@@ -277,8 +280,8 @@ void __init spear6xx_clk_init(void __iomem *misc_base)clk_register_clkdev (clk,"ahbmult2_clk" ,NULL ); clk =clk_register_mux (NULL ,"ddr_clk" , ddr_parents, -ARRAY_SIZE (ddr_parents),0 ,PLL_CLK_CFG ,MCTR_CLK_SHIFT , -MCTR_CLK_MASK ,0 , &_lock); +ARRAY_SIZE (ddr_parents),CLK_SET_RATE_NO_REPARENT , +PLL_CLK_CFG ,MCTR_CLK_SHIFT ,MCTR_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,"ddr_clk" ,NULL ); clk = clk_register_divider(NULL, "apb_clk", "ahb_clk",
drivers/clk/sunxi/clk-sunxi.c +2 -1
@@ -261,7 +261,8 @@ static void __init sunxi_mux_clk_setup(struct device_node *node,while (i <5 && (parents[i] =of_clk_get_parent_name (node, i)) !=NULL ) i++; - clk =clk_register_mux (NULL , clk_name, parents, i,0 , reg, + clk =clk_register_mux (NULL , clk_name, parents, i, +CLK_SET_RATE_NO_REPARENT , reg, data->shift,SUNXI_MUX_GATE_WIDTH ,0 , &clk_lock);
drivers/clk/tegra/clk-tegra114.c +24 -12
@@ -1435,7 +1435,8 @@ static void __init tegra114_audio_clk_init(void __iomem *clk_base)/* audio0 */ clk =clk_register_mux (NULL ,"audio0_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_I2S0 ,0 ,3 ,0 ,NULL ); clks[audio0_mux] = clk;
@@ -1447,7 +1448,8 @@ static void __init tegra114_audio_clk_init(void __iomem *clk_base)/* audio1 */ clk =clk_register_mux (NULL ,"audio1_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_I2S1 ,0 ,3 ,0 ,NULL ); clks[audio1_mux] = clk;
@@ -1459,7 +1461,8 @@ static void __init tegra114_audio_clk_init(void __iomem *clk_base)/* audio2 */ clk =clk_register_mux (NULL ,"audio2_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_I2S2 ,0 ,3 ,0 ,NULL ); clks[audio2_mux] = clk;
@@ -1471,7 +1474,8 @@ static void __init tegra114_audio_clk_init(void __iomem *clk_base)/* audio3 */ clk =clk_register_mux (NULL ,"audio3_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_I2S3 ,0 ,3 ,0 ,NULL ); clks[audio3_mux] = clk;
@@ -1483,7 +1487,8 @@ static void __init tegra114_audio_clk_init(void __iomem *clk_base)/* audio4 */ clk =clk_register_mux (NULL ,"audio4_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_I2S4 ,0 ,3 ,0 ,NULL ); clks[audio4_mux] = clk;
@@ -1495,7 +1500,8 @@ static void __init tegra114_audio_clk_init(void __iomem *clk_base)/* spdif */ clk =clk_register_mux (NULL ,"spdif_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_SPDIF ,0 ,3 ,0 ,NULL ); clks[spdif_mux] = clk;
@@ -1590,7 +1596,8 @@ static void __init tegra114_pmc_clk_init(void __iomem *pmc_base)/* clk_out_1 */ clk =clk_register_mux (NULL ,"clk_out_1_mux" , clk_out1_parents, -ARRAY_SIZE (clk_out1_parents),0 , +ARRAY_SIZE (clk_out1_parents), +CLK_SET_RATE_NO_REPARENT , pmc_base +PMC_CLK_OUT_CNTRL ,6 ,3 ,0 , &clk_out_lock); clks[clk_out_1_mux] = clk;
@@ -1602,7 +1609,8 @@ static void __init tegra114_pmc_clk_init(void __iomem *pmc_base)/* clk_out_2 */ clk =clk_register_mux (NULL ,"clk_out_2_mux" , clk_out2_parents, -ARRAY_SIZE (clk_out1_parents),0 , +ARRAY_SIZE (clk_out1_parents), +CLK_SET_RATE_NO_REPARENT , pmc_base +PMC_CLK_OUT_CNTRL ,14 ,3 ,0 , &clk_out_lock); clks[clk_out_2_mux] = clk;
@@ -1614,7 +1622,8 @@ static void __init tegra114_pmc_clk_init(void __iomem *pmc_base)/* clk_out_3 */ clk =clk_register_mux (NULL ,"clk_out_3_mux" , clk_out3_parents, -ARRAY_SIZE (clk_out1_parents),0 , +ARRAY_SIZE (clk_out1_parents), +CLK_SET_RATE_NO_REPARENT , pmc_base +PMC_CLK_OUT_CNTRL ,22 ,3 ,0 , &clk_out_lock); clks[clk_out_3_mux] = clk;
@@ -1928,7 +1937,8 @@ static __init void tegra114_periph_clk_init(void __iomem *clk_base)/* dsia */ clk =clk_register_mux (NULL ,"dsia_mux" , mux_plld_out0_plld2_out0, -ARRAY_SIZE (mux_plld_out0_plld2_out0),0 , +ARRAY_SIZE (mux_plld_out0_plld2_out0), +CLK_SET_RATE_NO_REPARENT , clk_base +PLLD_BASE ,25 ,1 ,0 , &pll_d_lock); clks[dsia_mux] = clk; clk = tegra_clk_register_periph_gate("dsia", "dsia_mux", 0, clk_base,
@@ -1938,7 +1948,8 @@ static __init void tegra114_periph_clk_init(void __iomem *clk_base)/* dsib */ clk =clk_register_mux (NULL ,"dsib_mux" , mux_plld_out0_plld2_out0, -ARRAY_SIZE (mux_plld_out0_plld2_out0),0 , +ARRAY_SIZE (mux_plld_out0_plld2_out0), +CLK_SET_RATE_NO_REPARENT , clk_base +PLLD2_BASE ,25 ,1 ,0 , &pll_d2_lock); clks[dsib_mux] = clk; clk = tegra_clk_register_periph_gate("dsib", "dsib_mux", 0, clk_base,
@@ -1975,7 +1986,8 @@ static __init void tegra114_periph_clk_init(void __iomem *clk_base)/* emc */ clk =clk_register_mux (NULL ,"emc_mux" , mux_pllmcp_clkm, -ARRAY_SIZE (mux_pllmcp_clkm),0 , +ARRAY_SIZE (mux_pllmcp_clkm), +CLK_SET_RATE_NO_REPARENT , clk_base +CLK_SOURCE_EMC ,29 ,3 ,0 ,NULL ); clk = tegra_clk_register_periph_gate("emc", "emc_mux", 0, clk_base,
drivers/clk/tegra/clk-tegra20.c +4 -2
@@ -778,7 +778,8 @@ static void __init tegra20_audio_clk_init(void)/* audio */ clk =clk_register_mux (NULL ,"audio_mux" , audio_parents, -ARRAY_SIZE (audio_parents),0 , +ARRAY_SIZE (audio_parents), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK ,0 ,3 ,0 ,NULL ); clk = clk_register_gate(NULL, "audio", "audio_mux", 0, clk_base + AUDIO_SYNC_CLK, 4,
@@ -933,7 +934,8 @@ static void __init tegra20_periph_clk_init(void)/* emc */ clk =clk_register_mux (NULL ,"emc_mux" , mux_pllmcp_clkm, -ARRAY_SIZE (mux_pllmcp_clkm),0 , +ARRAY_SIZE (mux_pllmcp_clkm), +CLK_SET_RATE_NO_REPARENT , clk_base +CLK_SOURCE_EMC ,30 ,2 ,0 ,NULL ); clk = tegra_clk_register_periph_gate("emc", "emc_mux", 0, clk_base, 0,
drivers/clk/tegra/clk-tegra30.c +22 -11
@@ -1008,7 +1008,8 @@ static void __init tegra30_pll_init(void)/* PLLE */ clk =clk_register_mux (NULL ,"pll_e_mux" , pll_e_parents, -ARRAY_SIZE (pll_e_parents),0 , +ARRAY_SIZE (pll_e_parents), +CLK_SET_RATE_NO_REPARENT , clk_base +PLLE_AUX ,2 ,1 ,0 ,NULL ); clk = tegra_clk_register_plle("pll_e", "pll_e_mux", clk_base, pmc_base, CLK_GET_RATE_NOCACHE, 100000000, &pll_e_params,
@@ -1068,7 +1069,8 @@ static void __init tegra30_audio_clk_init(void)/* audio0 */ clk =clk_register_mux (NULL ,"audio0_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_I2S0 ,0 ,3 ,0 ,NULL ); clk = clk_register_gate(NULL, "audio0", "audio0_mux", 0, clk_base + AUDIO_SYNC_CLK_I2S0, 4,
@@ -1078,7 +1080,8 @@ static void __init tegra30_audio_clk_init(void)/* audio1 */ clk =clk_register_mux (NULL ,"audio1_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_I2S1 ,0 ,3 ,0 ,NULL ); clk = clk_register_gate(NULL, "audio1", "audio1_mux", 0, clk_base + AUDIO_SYNC_CLK_I2S1, 4,
@@ -1088,7 +1091,8 @@ static void __init tegra30_audio_clk_init(void)/* audio2 */ clk =clk_register_mux (NULL ,"audio2_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_I2S2 ,0 ,3 ,0 ,NULL ); clk = clk_register_gate(NULL, "audio2", "audio2_mux", 0, clk_base + AUDIO_SYNC_CLK_I2S2, 4,
@@ -1098,7 +1102,8 @@ static void __init tegra30_audio_clk_init(void)/* audio3 */ clk =clk_register_mux (NULL ,"audio3_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_I2S3 ,0 ,3 ,0 ,NULL ); clk = clk_register_gate(NULL, "audio3", "audio3_mux", 0, clk_base + AUDIO_SYNC_CLK_I2S3, 4,
@@ -1108,7 +1113,8 @@ static void __init tegra30_audio_clk_init(void)/* audio4 */ clk =clk_register_mux (NULL ,"audio4_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_I2S4 ,0 ,3 ,0 ,NULL ); clk = clk_register_gate(NULL, "audio4", "audio4_mux", 0, clk_base + AUDIO_SYNC_CLK_I2S4, 4,
@@ -1118,7 +1124,8 @@ static void __init tegra30_audio_clk_init(void)/* spdif */ clk =clk_register_mux (NULL ,"spdif_mux" , mux_audio_sync_clk, -ARRAY_SIZE (mux_audio_sync_clk),0 , +ARRAY_SIZE (mux_audio_sync_clk), +CLK_SET_RATE_NO_REPARENT , clk_base +AUDIO_SYNC_CLK_SPDIF ,0 ,3 ,0 ,NULL ); clk = clk_register_gate(NULL, "spdif", "spdif_mux", 0, clk_base + AUDIO_SYNC_CLK_SPDIF, 4,
@@ -1211,7 +1218,8 @@ static void __init tegra30_pmc_clk_init(void)/* clk_out_1 */ clk =clk_register_mux (NULL ,"clk_out_1_mux" , clk_out1_parents, -ARRAY_SIZE (clk_out1_parents),0 , +ARRAY_SIZE (clk_out1_parents), +CLK_SET_RATE_NO_REPARENT , pmc_base +PMC_CLK_OUT_CNTRL ,6 ,3 ,0 , &clk_out_lock); clks[clk_out_1_mux] = clk;
@@ -1223,7 +1231,8 @@ static void __init tegra30_pmc_clk_init(void)/* clk_out_2 */ clk =clk_register_mux (NULL ,"clk_out_2_mux" , clk_out2_parents, -ARRAY_SIZE (clk_out1_parents),0 , +ARRAY_SIZE (clk_out1_parents), +CLK_SET_RATE_NO_REPARENT , pmc_base +PMC_CLK_OUT_CNTRL ,14 ,3 ,0 , &clk_out_lock); clk = clk_register_gate(NULL, "clk_out_2", "clk_out_2_mux", 0,
@@ -1234,7 +1243,8 @@ static void __init tegra30_pmc_clk_init(void)/* clk_out_3 */ clk =clk_register_mux (NULL ,"clk_out_3_mux" , clk_out3_parents, -ARRAY_SIZE (clk_out1_parents),0 , +ARRAY_SIZE (clk_out1_parents), +CLK_SET_RATE_NO_REPARENT , pmc_base +PMC_CLK_OUT_CNTRL ,22 ,3 ,0 , &clk_out_lock); clk = clk_register_gate(NULL, "clk_out_3", "clk_out_3_mux", 0,
@@ -1655,7 +1665,8 @@ static void __init tegra30_periph_clk_init(void)/* emc */ clk =clk_register_mux (NULL ,"emc_mux" , mux_pllmcp_clkm, -ARRAY_SIZE (mux_pllmcp_clkm),0 , +ARRAY_SIZE (mux_pllmcp_clkm), +CLK_SET_RATE_NO_REPARENT , clk_base +CLK_SOURCE_EMC ,30 ,2 ,0 ,NULL ); clk = tegra_clk_register_periph_gate("emc", "emc_mux", 0, clk_base, 0,
drivers/clk/versatile/clk-vexpress.c +2 -2
@@ -37,8 +37,8 @@ static void __init vexpress_sp810_init(void __iomem *base)snprintf (name,ARRAY_SIZE (name),"timerclken%d" , i); vexpress_sp810_timerclken[i] =clk_register_mux (NULL , name, - parents,2 ,0 , base +SCCTRL , -SCCTRL_TIMERENnSEL_SHIFT (i),1 , + parents,2 ,CLK_SET_RATE_NO_REPARENT , + base +SCCTRL ,SCCTRL_TIMERENnSEL_SHIFT (i),1 ,0 , &vexpress_sp810_lock);if (WARN_ON (IS_ERR (vexpress_sp810_timerclken[i])))
include/linux/clk-provider.h +1 -0
@@ -27,6 +27,7 @@#define CLK_IS_ROOT BIT(4)/* root clk, has no parent */ #define CLK_IS_BASIC BIT(5)/* Basic clk, can't do a to_clk_foo() */ #define CLK_GET_RATE_NOCACHE BIT(6)/* do not use the cached clk rate */ +#define CLK_SET_RATE_NO_REPARENT BIT(7)/* don't re-parent on rate change */ struct clk_hw ;
Signature · 1 line
1.8.1.2
PATCH v3 4/4 clk: clk-mux: implement remuxing on set_rate
In reply to James HoganImplement clk-mux remuxing if the CLK_SET_RATE_NO_REPARENT flag isn't set. This implements determine_rate for clk-mux to propagate to each parent and to choose the best one (like clk-divider this chooses the parent which provides the fastest rate <= the requested rate).
The determine_rate op is implemented as a core helper function so that it can be easily used by more complex clocks which incorporate muxes.
---
Changes in v3:
* rename/invert CLK_SET_RATE_REMUX to CLK_SET_RATE_NO_REPARENT and move to patch 3.
drivers/clk/clk-mux.c | 1 + drivers/clk/clk.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/clk-provider.h | 3 +++ 3 files changed, 53 insertions(+)
drivers/clk/clk-mux.c +1 -0
@@ -100,6 +100,7 @@ static int clk_mux_set_parent(struct clk_hw *hw, u8 index)const struct clk_ops clk_mux_ops = { .get_parent = clk_mux_get_parent, .set_parent = clk_mux_set_parent, + .determine_rate = __clk_mux_determine_rate, };EXPORT_SYMBOL_GPL (clk_mux_ops);
drivers/clk/clk.c +49 -0
55 lines not on this page · raw message
include/linux/clk-provider.h +3 -0
@@ -419,6 +419,9 @@ unsigned long __clk_get_flags(struct clk *clk);bool __clk_is_prepared (struct clk *clk);bool __clk_is_enabled (struct clk *clk);struct clk *__clk_lookup (const char *name); +long __clk_mux_determine_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *best_parent_rate, +struct clk **best_parent_p);/* * FIXME clock api without lock protection
Signature · 1 line
1.8.1.2