Skip to content

Commit

Permalink
clk: vexpress: Use common of_clk_init() function
Browse files Browse the repository at this point in the history
Use common of_clk_init() function for clock initialization.

Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Tested-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
  • Loading branch information
Prashant Gaikwad authored and Mike Turquette committed Jan 24, 2013
1 parent 1029003 commit 8ae5ac5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
1 change: 1 addition & 0 deletions drivers/clk/versatile/clk-vexpress-osc.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,4 @@ void __init vexpress_osc_of_setup(struct device_node *node)
vexpress_config_func_put(osc->func);
kfree(osc);
}
CLK_OF_DECLARE(vexpress_soc, "arm,vexpress-osc", vexpress_osc_of_setup);
8 changes: 1 addition & 7 deletions drivers/clk/versatile/clk-vexpress.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 8ae5ac5

Please sign in to comment.