projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
clk
/
mvebu
/
armada-370.c
diff --git
a/drivers/clk/mvebu/armada-370.c
b/drivers/clk/mvebu/armada-370.c
index
81a202d
..
bef198a
100644
(file)
--- 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),
};
.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
*/
/*
* 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);
+