diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:34:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:34:27 +0100 |
| commit | a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf (patch) | |
| tree | 95a0df31b0c9b1e0357b8dd378e2eab637970df4 /drivers/clk/mvebu/armada-370.c | |
| parent | 2b3942e4bb20ef8ef26515bd958c2df83d9a6210 (diff) | |
| parent | 96b3d28bf4b00f62fc8386ff5d487d1830793a3d (diff) | |
| download | linux-a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf.tar.bz2 | |
Merge branch 'sched/urgent' into sched/core
Pick up fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clk/mvebu/armada-370.c')
| -rw-r--r-- | drivers/clk/mvebu/armada-370.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/clk/mvebu/armada-370.c b/drivers/clk/mvebu/armada-370.c index 81a202d12a7a..bef198a83863 100644 --- a/drivers/clk/mvebu/armada-370.c +++ b/drivers/clk/mvebu/armada-370.c @@ -141,13 +141,6 @@ static const struct coreclk_soc_desc a370_coreclks = { .num_ratios = ARRAY_SIZE(a370_coreclk_ratios), }; -static void __init a370_coreclk_init(struct device_node *np) -{ - mvebu_coreclk_setup(np, &a370_coreclks); -} -CLK_OF_DECLARE(a370_core_clk, "marvell,armada-370-core-clock", - a370_coreclk_init); - /* * Clock Gating Control */ @@ -168,9 +161,15 @@ static const struct clk_gating_soc_desc a370_gating_desc[] __initconst = { { } }; -static void __init a370_clk_gating_init(struct device_node *np) +static void __init a370_clk_init(struct device_node *np) { - mvebu_clk_gating_setup(np, a370_gating_desc); + struct device_node *cgnp = + of_find_compatible_node(NULL, NULL, "marvell,armada-370-gating-clock"); + + mvebu_coreclk_setup(np, &a370_coreclks); + + if (cgnp) + mvebu_clk_gating_setup(cgnp, a370_gating_desc); } -CLK_OF_DECLARE(a370_clk_gating, "marvell,armada-370-gating-clock", - a370_clk_gating_init); +CLK_OF_DECLARE(a370_clk, "marvell,armada-370-core-clock", a370_clk_init); + |