diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-25 08:07:53 +0100 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-25 08:07:53 +0100 |
| commit | ad077ceb8a90c7ef1fc15758ed3811448181ee80 (patch) | |
| tree | dc090e24bb82c41c3785e539b9e60df6c48abfaf /drivers/clk/mvebu/dove.c | |
| parent | clk: ti: am335x: remove unecessary cpu0 clk node (diff) | |
| parent | Merge branch 'clocks/fixes/drivers' of git://linuxtv.org/pinchartl/fbdev into... (diff) | |
| download | linux-ad077ceb8a90c7ef1fc15758ed3811448181ee80.tar.xz linux-ad077ceb8a90c7ef1fc15758ed3811448181ee80.zip | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk/mvebu/dove.c')
| -rw-r--r-- | drivers/clk/mvebu/dove.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/clk/mvebu/dove.c b/drivers/clk/mvebu/dove.c index 38aee1e3f242..b8c2424ac926 100644 --- a/drivers/clk/mvebu/dove.c +++ b/drivers/clk/mvebu/dove.c @@ -154,12 +154,6 @@ static const struct coreclk_soc_desc dove_coreclks = { .num_ratios = ARRAY_SIZE(dove_coreclk_ratios), }; -static void __init dove_coreclk_init(struct device_node *np) -{ - mvebu_coreclk_setup(np, &dove_coreclks); -} -CLK_OF_DECLARE(dove_core_clk, "marvell,dove-core-clock", dove_coreclk_init); - /* * Clock Gating Control */ @@ -186,9 +180,14 @@ static const struct clk_gating_soc_desc dove_gating_desc[] __initconst = { { } }; -static void __init dove_clk_gating_init(struct device_node *np) +static void __init dove_clk_init(struct device_node *np) { - mvebu_clk_gating_setup(np, dove_gating_desc); + struct device_node *cgnp = + of_find_compatible_node(NULL, NULL, "marvell,dove-gating-clock"); + + mvebu_coreclk_setup(np, &dove_coreclks); + + if (cgnp) + mvebu_clk_gating_setup(cgnp, dove_gating_desc); } -CLK_OF_DECLARE(dove_clk_gating, "marvell,dove-gating-clock", - dove_clk_gating_init); +CLK_OF_DECLARE(dove_clk, "marvell,dove-core-clock", dove_clk_init); |