summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/time.c
diff options
context:
space:
mode:
authorKevin Hao <haokexin@gmail.com>2014-12-03 09:53:52 +0100
committerMichael Turquette <mturquette@linaro.org>2015-01-20 19:09:02 +0100
commitf0d373009205b53c7e14b6ac6d939ac5dcce60ca (patch)
tree2663e82a28808044e1d2f844ef73008fe23dd743 /arch/powerpc/kernel/time.c
parentclk: exynos-audss: Fix memory leak on driver unbind or probe failure (diff)
downloadlinux-f0d373009205b53c7e14b6ac6d939ac5dcce60ca.tar.xz
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/kernel/time.c')
-rw-r--r--arch/powerpc/kernel/time.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index fa7c4f12104f..df9fa05b5fd3 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -54,6 +54,7 @@
#include <linux/irq.h>
#include <linux/delay.h>
#include <linux/irq_work.h>
+#include <linux/clk-provider.h>
#include <asm/trace.h>
#include <asm/io.h>
@@ -943,6 +944,10 @@ void __init time_init(void)
init_decrementer_clockevent();
tick_setup_hrtimer_broadcast();
+
+#ifdef CONFIG_COMMON_CLK
+ of_clk_init(NULL);
+#endif
}