summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/512x
diff options
context:
space:
mode:
authorKevin Hao <haokexin@gmail.com>2014-12-03 16:53:52 +0800
committerMichael Turquette <mturquette@linaro.org>2015-01-20 10:09:02 -0800
commitf0d373009205b53c7e14b6ac6d939ac5dcce60ca (patch)
tree2663e82a28808044e1d2f844ef73008fe23dd743 /arch/powerpc/platforms/512x
parent27c76c43623fe835a2b652228363ed108373609d (diff)
downloadblackbird-op-linux-f0d373009205b53c7e14b6ac6d939ac5dcce60ca.tar.gz
blackbird-op-linux-f0d373009205b53c7e14b6ac6d939ac5dcce60ca.zip
powerpc: call of_clk_init() from time_init()
So the boards which has COMMON_CLK enabled don't have to invoke this in its board specific file. Signed-off-by: Kevin Hao <haokexin@gmail.com> Acked-by: Scott Wood <scottwood@freescale.com> Acked-by: Michael Turquette <mturquette@linaro.org> Signed-off-by: Michael Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/powerpc/platforms/512x')
-rw-r--r--arch/powerpc/platforms/512x/clock-commonclk.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/512x/clock-commonclk.c b/arch/powerpc/platforms/512x/clock-commonclk.c
index 6eb614a271fb..f691bcabd710 100644
--- a/arch/powerpc/platforms/512x/clock-commonclk.c
+++ b/arch/powerpc/platforms/512x/clock-commonclk.c
@@ -1168,6 +1168,11 @@ static void mpc5121_clk_provide_backwards_compat(void)
}
}
+/*
+ * The "fixed-clock" nodes (which includes the oscillator node if the board's
+ * DT provides one) has already been scanned by the of_clk_init() in
+ * time_init().
+ */
int __init mpc5121_clk_init(void)
{
struct device_node *clk_np;
@@ -1187,12 +1192,6 @@ int __init mpc5121_clk_init(void)
mpc512x_clk_preset_data();
/*
- * have the device tree scanned for "fixed-clock" nodes (which
- * includes the oscillator node if the board's DT provides one)
- */
- of_clk_init(NULL);
-
- /*
* add a dummy clock for those situations where a clock spec is
* required yet no real clock is involved
*/
OpenPOWER on IntegriCloud