summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2016-10-31 13:26:25 -0700
committerVineet Gupta <vgupta@synopsys.com>2016-11-30 11:54:25 -0800
commit92b03314033c0d36ef3a5e68ccdc65ad2a4d17c5 (patch)
treef0cd8ddbd8aacd9c46f49033e9520e9f8206786d
parent044214200b0b7aa4633d2e93529e55b5ca50a5a5 (diff)
downloadtalos-obmc-linux-92b03314033c0d36ef3a5e68ccdc65ad2a4d17c5.tar.gz
talos-obmc-linux-92b03314033c0d36ef3a5e68ccdc65ad2a4d17c5.zip
ARC: time: move time_init() out of the driver
to allow future git mv of the driver into drivers/clocksource Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r--arch/arc/kernel/setup.c11
-rw-r--r--arch/arc/kernel/time.c9
2 files changed, 11 insertions, 9 deletions
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index c6914acb68a9..3093fa898a23 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -10,6 +10,8 @@
#include <linux/fs.h>
#include <linux/delay.h>
#include <linux/root_dev.h>
+#include <linux/clk-provider.h>
+#include <linux/clocksource.h>
#include <linux/console.h>
#include <linux/module.h>
#include <linux/cpu.h>
@@ -449,6 +451,15 @@ void __init setup_arch(char **cmdline_p)
arc_unwind_init();
}
+/*
+ * Called from start_kernel() - boot CPU only
+ */
+void __init time_init(void)
+{
+ of_clk_init(NULL);
+ clocksource_probe();
+}
+
static int __init customize_machine(void)
{
if (machine_desc->init_machine)
diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c
index 4d0c75b86b10..417d32e031d3 100644
--- a/arch/arc/kernel/time.c
+++ b/arch/arc/kernel/time.c
@@ -361,12 +361,3 @@ static int __init arc_of_timer_init(struct device_node *np)
return ret;
}
CLOCKSOURCE_OF_DECLARE(arc_clkevt, "snps,arc-timer", arc_of_timer_init);
-
-/*
- * Called from start_kernel() - boot CPU only
- */
-void __init time_init(void)
-{
- of_clk_init(NULL);
- clocksource_probe();
-}
OpenPOWER on IntegriCloud