diff options
| author |   Noam Camus <noamc@ezchip.com> | 2016-01-14 12:20:08 +0530 |
|---|---|---|
| committer |   Vineet Gupta <vgupta@synopsys.com> | 2016-05-09 09:32:29 +0530 |
| commit | 69fbd09874ded099d445271d05681529dac4d00a (patch) | |
| tree | 955cbb63501600a628ebcac8a4c618fad41b46c1 | |
| parent | ARC: clockevent: switch to cpu notifier for clockevent setup (diff) | |
| download | linux-dev-69fbd09874ded099d445271d05681529dac4d00a.tar.xz linux-dev-69fbd09874ded099d445271d05681529dac4d00a.zip | |
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>
| -rw-r--r-- | arch/arc/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arc/kernel/setup.c | 2 | ||||
| -rw-r--r-- | arch/arc/kernel/time.c | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index a8767430df7d..ae3943435abf 100644 --- 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 151acf0c9383..507ec523112a 100644 --- 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> @@ -444,7 +443,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 e97be743d47b..848353a27ac8 100644 --- 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 |