clk: versatile: pass a name to ICST clock provider
Subsystems (2)
PATCH 1/2 clk: versatile: pass a name to ICST clock provider
When we have more than one of these clocks in a system (such as on the IM-PD1) we need a mechanism to pass a name for the clock. Refactor to add this as an argument.
---
Hi Mike, I'd like an ACK for this if you're OK with it, so I can take it through the ARM SoC tree with the rest of the Integrator patches.
--- drivers/clk/versatile/clk-icst.c | 3 ++- drivers/clk/versatile/clk-icst.h | 1 + drivers/clk/versatile/clk-impd1.c | 4 ++-- drivers/clk/versatile/clk-integrator.c | 2 +- drivers/clk/versatile/clk-realview.c | 6 ++++-- 5 files changed, 10 insertions(+), 6 deletions(-)
drivers/clk/versatile/clk-icst.c +2 -1
@@ -119,6 +119,7 @@ static const struct clk_ops icst_ops = {struct clk *icst_clk_register (struct device *dev,const struct clk_icst_desc *desc, +const char *name,void __iomem *base) {struct clk *clk;
@@ -130,7 +131,7 @@ struct clk *icst_clk_register(struct device *dev,pr_err ("could not allocate ICST clock!\n" );return ERR_PTR (-ENOMEM ); } - init.name ="icst" ; + init.name = name; init.ops = &icst_ops; init.flags =CLK_IS_ROOT ; init.parent_names =NULL ;
drivers/clk/versatile/clk-icst.h +1 -0
@@ -15,4 +15,5 @@ struct clk_icst_desc {struct clk *icst_clk_register (struct device *dev,const struct clk_icst_desc *desc, +const char *name,void __iomem *base);
drivers/clk/versatile/clk-impd1.c +2 -2
@@ -66,8 +66,8 @@ void integrator_impd1_clk_init(void __iomem *base, unsigned int id) } imc = &impd1_clks[id]; - clk =icst_clk_register (NULL , &impd1_icst1_desc, base); - imc->vcoclk = clk; + clk =icst_clk_register (NULL , &impd1_icst1_desc,"icst1" , base); + imc->vco1clk = clk; imc->clks[0 ] =clkdev_alloc (clk,NULL ,"lm%x:01000" , id);/* UART reference clock */
drivers/clk/versatile/clk-integrator.c +1 -1
@@ -78,7 +78,7 @@ void __init integrator_clk_init(bool is_cp)clk_register_clkdev (clk,NULL ,"sp804" );/* ICST VCO clock used on the Integrator/CP CLCD */ - clk =icst_clk_register (NULL , &cp_icst_desc, + clk =icst_clk_register (NULL , &cp_icst_desc,"icst" ,__io_address (INTEGRATOR_HDR_BASE ));clk_register_clkdev (clk,NULL ,"clcd" ); }
drivers/clk/versatile/clk-realview.c +4 -2
@@ -84,9 +84,11 @@ void __init realview_clk_init(void __iomem *sysbase, bool is_pb1176)/* ICST VCO clock */ if (is_pb1176) - clk =icst_clk_register (NULL , &realview_osc0_desc, sysbase); + clk =icst_clk_register (NULL , &realview_osc0_desc, +"osc0" , sysbase);else - clk =icst_clk_register (NULL , &realview_osc4_desc, sysbase); + clk =icst_clk_register (NULL , &realview_osc4_desc, +"osc4" , sysbase);clk_register_clkdev (clk,NULL ,"dev:clcd" );clk_register_clkdev (clk,NULL ,"issp:clcd" );
Signature · 1 line
1.8.3.1
PATCH 1/2 clk: versatile: pass a name to ICST clock provider
Quoted 9 lines · Linus Walleij
When we have more than one of these clocks in a system (such as on the IM-PD1) we need a mechanism to pass a name for the clock. Refactor to add this as an argument.
Signed-off-by Linus Walleij <[email protected]>---
Hi Mike, I'd like an ACK for this if you're OK with it, so I can take it through the ARM SoC tree with the rest of the Integrator patches.
Mike, ping on this. I want to prep a pull request...
Yours,
Linus Walleij
PATCH 1/2 clk: versatile: pass a name to ICST clock provider
Quoted 6 lines · Linus Walleij
Quoted 4 lines · Linus Walleij
When we have more than one of these clocks in a system (such as on the IM-PD1) we need a mechanism to pass a name for the clock. Refactor to add this as an argument.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Linus Walleij <[email protected]>---
Hi Mike, I'd like an ACK for this if you're OK with it, so I can take it through the ARM SoC tree with the rest of the Integrator patches.Mike, ping on this. I want to prep a pull request...
Ping on this again.
Yours,
Linus Walleij
PATCH 1/2 clk: versatile: pass a name to ICST clock provider
In reply to Linus WalleijQuoting Linus Walleij (2013-11-24 12:58:52)
Quoted 5 lines
When we have more than one of these clocks in a system (such as on the IM-PD1) we need a mechanism to pass a name for the clock. Refactor to add this as an argument.
Signed-off-by Linus Walleij <[email protected]>
Quoted 92 lines
---
Hi Mike, I'd like an ACK for this if you're OK with it, so I can take it through the ARM SoC tree with the rest of the Integrator patches.--- drivers/clk/versatile/clk-icst.c | 3 ++- drivers/clk/versatile/clk-icst.h | 1 + drivers/clk/versatile/clk-impd1.c | 4 ++-- drivers/clk/versatile/clk-integrator.c | 2 +- drivers/clk/versatile/clk-realview.c | 6 ++++-- 5 files changed, 10 insertions(+), 6 deletions(-)drivers/clk/versatile/clk-icst.c +2
-1@@ -119,6 +119,7 @@ static const struct clk_ops icst_ops = {struct clk *icst_clk_register (struct device *dev,const struct clk_icst_desc *desc, +const char *name,void __iomem *base) {struct clk *clk;@@ -130,7 +131,7 @@ struct clk *icst_clk_register(struct device *dev,pr_err ("could not allocate ICST clock!\n" );return ERR_PTR (-ENOMEM ); } - init.name ="icst" ; + init.name = name; init.ops = &icst_ops; init.flags =CLK_IS_ROOT ; init.parent_names =NULL ;drivers/clk/versatile/clk-icst.h +1
-0@@ -15,4 +15,5 @@ struct clk_icst_desc {struct clk *icst_clk_register (struct device *dev,const struct clk_icst_desc *desc, +const char *name,void __iomem *base);drivers/clk/versatile/clk-impd1.c +2
-2@@ -66,8 +66,8 @@ void integrator_impd1_clk_init(void __iomem *base, unsigned int id) } imc = &impd1_clks[id]; - clk =icst_clk_register (NULL , &impd1_icst1_desc, base); - imc->vcoclk = clk; + clk =icst_clk_register (NULL , &impd1_icst1_desc,"icst1" , base); + imc->vco1clk = clk; imc->clks[0 ] =clkdev_alloc (clk,NULL ,"lm%x:01000" , id);/* UART reference clock */ drivers/clk/versatile/clk-integrator.c +1
-1@@ -78,7 +78,7 @@ void __init integrator_clk_init(bool is_cp)clk_register_clkdev (clk,NULL ,"sp804" );/* ICST VCO clock used on the Integrator/CP CLCD */ - clk =icst_clk_register (NULL , &cp_icst_desc, + clk =icst_clk_register (NULL , &cp_icst_desc,"icst" ,__io_address (INTEGRATOR_HDR_BASE ));clk_register_clkdev (clk,NULL ,"clcd" ); }drivers/clk/versatile/clk-realview.c +4
-2@@ -84,9 +84,11 @@ void __init realview_clk_init(void __iomem *sysbase, bool is_pb1176)/* ICST VCO clock */ if (is_pb1176) - clk =icst_clk_register (NULL , &realview_osc0_desc, sysbase); + clk =icst_clk_register (NULL , &realview_osc0_desc, +"osc0" , sysbase);else - clk =icst_clk_register (NULL , &realview_osc4_desc, sysbase); + clk =icst_clk_register (NULL , &realview_osc4_desc, +"osc4" , sysbase);clk_register_clkdev (clk,NULL ,"dev:clcd" );clk_register_clkdev (clk,NULL ,"issp:clcd" );Signature · 1 line
1.8.3.1