ARC: clockevent: Prepare for DT based probe

 - call clocksource_probe()
 - This in turns needs of_clk_init() to be called earlier

Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Noam Camus <noamc@ezchip.com>
[vgupta: broken off from a bigger patch]
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 8a188bc1786a2c5cb181f21e10e5ba254b368199..74689dfde0ae9229184b806d60766bdd4f58fb1f 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -10,8 +10,9 @@ config ARC
        def_bool y
        select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC
        select BUILDTIME_EXTABLE_SORT
-       select COMMON_CLK
+       select CLKSRC_OF
        select CLONE_BACKWARDS
+       select COMMON_CLK
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS
        select GENERIC_FIND_FIRST_BIT

diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index cdc821df1809209df9792bcf9ecada0bc991753f..2dad49c71c090643634e2a59e9bf72a107513ff8 100644 (file)
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -13,7 +13,6 @@
 #include <linux/console.h>
 #include <linux/module.h>
 #include <linux/cpu.h>
-#include <linux/clk-provider.h>
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 #include <linux/cache.h>
@@ -459,7 +458,6 @@ void __init setup_arch(char **cmdline_p)
 
 static int __init customize_machine(void)
 {
-       of_clk_init(NULL);
        /*
         * Traverses flattened DeviceTree - registering platform devices
         * (if any) complete with their resources

diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c
index e97be743d47b3af275528b3d6e02ce500735368f..848353a27ac82b3c48e4b65e4870c5818e1e504d 100644 (file)
--- a/arch/arc/kernel/time.c
+++ b/arch/arc/kernel/time.c
@@ -34,6 +34,8 @@
 #include <linux/kernel.h>
 #include <linux/time.h>
 #include <linux/init.h>
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
 #include <linux/cpu.h>
@@ -301,6 +303,9 @@ static void __init arc_clockevent_setup(void)
  */
 void __init time_init(void)
 {
+       of_clk_init(NULL);
+       clocksource_probe();
+
        /*
         * sets up the timekeeping free-flowing counter which also returns
         * whether the counter is usable as clocksource