diff options
Diffstat (limited to 'arch/arm/mach-vexpress/v2m.c')
-rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 95a469e23e37..4f8b8cb17ff5 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c | |||
@@ -1,12 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | * Versatile Express V2M Motherboard Support | 2 | * Versatile Express V2M Motherboard Support |
3 | */ | 3 | */ |
4 | #include <linux/clocksource.h> | ||
5 | #include <linux/device.h> | 4 | #include <linux/device.h> |
6 | #include <linux/amba/bus.h> | 5 | #include <linux/amba/bus.h> |
7 | #include <linux/amba/mmci.h> | 6 | #include <linux/amba/mmci.h> |
8 | #include <linux/io.h> | 7 | #include <linux/io.h> |
9 | #include <linux/clocksource.h> | ||
10 | #include <linux/smp.h> | 8 | #include <linux/smp.h> |
11 | #include <linux/init.h> | 9 | #include <linux/init.h> |
12 | #include <linux/of_address.h> | 10 | #include <linux/of_address.h> |
@@ -22,7 +20,6 @@ | |||
22 | #include <linux/regulator/fixed.h> | 20 | #include <linux/regulator/fixed.h> |
23 | #include <linux/regulator/machine.h> | 21 | #include <linux/regulator/machine.h> |
24 | #include <linux/vexpress.h> | 22 | #include <linux/vexpress.h> |
25 | #include <linux/clk-provider.h> | ||
26 | #include <linux/clkdev.h> | 23 | #include <linux/clkdev.h> |
27 | 24 | ||
28 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
@@ -422,16 +419,8 @@ void __init v2m_dt_init_early(void) | |||
422 | pr_warning("vexpress: DT HBI (%x) is not matching " | 419 | pr_warning("vexpress: DT HBI (%x) is not matching " |
423 | "hardware (%x)!\n", dt_hbi, hbi); | 420 | "hardware (%x)!\n", dt_hbi, hbi); |
424 | } | 421 | } |
425 | } | ||
426 | |||
427 | static void __init v2m_dt_timer_init(void) | ||
428 | { | ||
429 | of_clk_init(NULL); | ||
430 | 422 | ||
431 | clocksource_of_init(); | 423 | versatile_sched_clock_init(vexpress_get_24mhz_clock_base(), 24000000); |
432 | |||
433 | versatile_sched_clock_init(vexpress_get_24mhz_clock_base(), | ||
434 | 24000000); | ||
435 | } | 424 | } |
436 | 425 | ||
437 | static const struct of_device_id v2m_dt_bus_match[] __initconst = { | 426 | static const struct of_device_id v2m_dt_bus_match[] __initconst = { |
@@ -458,6 +447,5 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express") | |||
458 | .smp_init = smp_init_ops(vexpress_smp_init_ops), | 447 | .smp_init = smp_init_ops(vexpress_smp_init_ops), |
459 | .map_io = v2m_dt_map_io, | 448 | .map_io = v2m_dt_map_io, |
460 | .init_early = v2m_dt_init_early, | 449 | .init_early = v2m_dt_init_early, |
461 | .init_time = v2m_dt_timer_init, | ||
462 | .init_machine = v2m_dt_init, | 450 | .init_machine = v2m_dt_init, |
463 | MACHINE_END | 451 | MACHINE_END |