Merge remote-tracking branch 'mfd/for-mfd-next'

[karo-tx-linux.git] / arch / arm64 / kernel / time.c

diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
index 149151fb42bb1579127100f24a0f91a2124c92e1..13339b6ffc1a07839103fca328f1eccd6d185c12 100644 (file)
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -67,16 +67,10 @@ void __init time_init(void)
        u32 arch_timer_rate;
 
        of_clk_init(NULL);
-       clocksource_of_init();
+       clocksource_probe();
 
        tick_setup_hrtimer_broadcast();
 
-       /*
-        * Since ACPI or FDT will only one be available in the system,
-        * we can use acpi_generic_timer_init() here safely
-        */
-       acpi_generic_timer_init();
-
        arch_timer_rate = arch_timer_get_rate();
        if (!arch_timer_rate)
                panic("Unable to initialise architected timer.\n");