diff options
author | Kevin Hao <haokexin@gmail.com> | 2014-12-03 03:53:52 -0500 |
---|---|---|
committer | Michael Turquette <mturquette@linaro.org> | 2015-01-20 13:09:02 -0500 |
commit | f0d373009205b53c7e14b6ac6d939ac5dcce60ca (patch) | |
tree | 2663e82a28808044e1d2f844ef73008fe23dd743 /arch/powerpc/kernel/time.c | |
parent | 27c76c43623fe835a2b652228363ed108373609d (diff) |
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.c | 5 |
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 @@ | |||
54 | #include <linux/irq.h> | 54 | #include <linux/irq.h> |
55 | #include <linux/delay.h> | 55 | #include <linux/delay.h> |
56 | #include <linux/irq_work.h> | 56 | #include <linux/irq_work.h> |
57 | #include <linux/clk-provider.h> | ||
57 | #include <asm/trace.h> | 58 | #include <asm/trace.h> |
58 | 59 | ||
59 | #include <asm/io.h> | 60 | #include <asm/io.h> |
@@ -943,6 +944,10 @@ void __init time_init(void) | |||
943 | 944 | ||
944 | init_decrementer_clockevent(); | 945 | init_decrementer_clockevent(); |
945 | tick_setup_hrtimer_broadcast(); | 946 | tick_setup_hrtimer_broadcast(); |
947 | |||
948 | #ifdef CONFIG_COMMON_CLK | ||
949 | of_clk_init(NULL); | ||
950 | #endif | ||
946 | } | 951 | } |
947 | 952 | ||
948 | 953 | ||