| Message ID | 1357282858-2112-7-git-send-email-pgaikwad@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Prashant Gaikwad (2013-01-03 23:00:58) > Use common of_clk_init() function for clock initialization. > > Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> Pawel or Linus, Can I get a Tested-by before I take this series into clk-next? Thanks, Mike > --- > drivers/clk/versatile/clk-vexpress-osc.c | 1 + > drivers/clk/versatile/clk-vexpress.c | 8 +------- > 2 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c > index dcb6ae0..256c8be 100644 > --- a/drivers/clk/versatile/clk-vexpress-osc.c > +++ b/drivers/clk/versatile/clk-vexpress-osc.c > @@ -144,3 +144,4 @@ error: > vexpress_config_func_put(osc->func); > kfree(osc); > } > +CLK_OF_DECLARE(vexpress_soc, "arm,vexpress-osc", vexpress_osc_of_setup); > diff --git a/drivers/clk/versatile/clk-vexpress.c b/drivers/clk/versatile/clk-vexpress.c > index c742ac7..f889f2f 100644 > --- a/drivers/clk/versatile/clk-vexpress.c > +++ b/drivers/clk/versatile/clk-vexpress.c > @@ -99,19 +99,13 @@ struct clk *vexpress_sp810_of_get(struct of_phandle_args *clkspec, void *data) > return vexpress_sp810_timerclken[clkspec->args[0]]; > } > > -static const __initconst struct of_device_id vexpress_fixed_clk_match[] = { > - { .compatible = "fixed-clock", .data = of_fixed_clk_setup, }, > - { .compatible = "arm,vexpress-osc", .data = vexpress_osc_of_setup, }, > - {} > -}; > - > void __init vexpress_clk_of_init(void) > { > struct device_node *node; > struct clk *clk; > struct clk *refclk, *timclk; > > - of_clk_init(vexpress_fixed_clk_match); > + of_clk_init(NULL); > > node = of_find_compatible_node(NULL, NULL, "arm,sp810"); > vexpress_sp810_init(of_iomap(node, 0)); > -- > 1.7.4.1
On Fri, 2013-01-18 at 17:58 +0000, Mike Turquette wrote: > Quoting Prashant Gaikwad (2013-01-03 23:00:58) > > Use common of_clk_init() function for clock initialization. > > > > Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> > > Pawel or Linus, > > Can I get a Tested-by before I take this series into clk-next? I'll just got back to work and will test it soon, most likely tomorrow. Cheers! Pawel
On Fri, Jan 18, 2013 at 6:58 PM, Mike Turquette <mturquette@linaro.org> wrote: > Quoting Prashant Gaikwad (2013-01-03 23:00:58) >> Use common of_clk_init() function for clock initialization. >> >> Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> > > Pawel or Linus, > > Can I get a Tested-by before I take this series into clk-next? For this specific patch, I don't have a vexpress board, sorry... Yours, Linus Walleij
On Fri, 2013-01-04 at 07:00 +0000, Prashant Gaikwad wrote: > Use common of_clk_init() function for clock initialization. > > Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> Just tested on VE, looks good to me. So for this patch and the "[1/7] clk: add common of_clk_init() function" one: Tested-by: Pawel Moll <pawel.moll@arm.com> Cheers! Pawel
diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c index dcb6ae0..256c8be 100644 --- a/drivers/clk/versatile/clk-vexpress-osc.c +++ b/drivers/clk/versatile/clk-vexpress-osc.c @@ -144,3 +144,4 @@ error: vexpress_config_func_put(osc->func); kfree(osc); } +CLK_OF_DECLARE(vexpress_soc, "arm,vexpress-osc", vexpress_osc_of_setup); diff --git a/drivers/clk/versatile/clk-vexpress.c b/drivers/clk/versatile/clk-vexpress.c index c742ac7..f889f2f 100644 --- a/drivers/clk/versatile/clk-vexpress.c +++ b/drivers/clk/versatile/clk-vexpress.c @@ -99,19 +99,13 @@ struct clk *vexpress_sp810_of_get(struct of_phandle_args *clkspec, void *data) return vexpress_sp810_timerclken[clkspec->args[0]]; } -static const __initconst struct of_device_id vexpress_fixed_clk_match[] = { - { .compatible = "fixed-clock", .data = of_fixed_clk_setup, }, - { .compatible = "arm,vexpress-osc", .data = vexpress_osc_of_setup, }, - {} -}; - void __init vexpress_clk_of_init(void) { struct device_node *node; struct clk *clk; struct clk *refclk, *timclk; - of_clk_init(vexpress_fixed_clk_match); + of_clk_init(NULL); node = of_find_compatible_node(NULL, NULL, "arm,sp810"); vexpress_sp810_init(of_iomap(node, 0));
Use common of_clk_init() function for clock initialization. Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> --- drivers/clk/versatile/clk-vexpress-osc.c | 1 + drivers/clk/versatile/clk-vexpress.c | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-)