summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/time.c
diff options
context:
space:
mode:
authorMarc Zyngier <Marc.Zyngier@arm.com>2015-09-28 16:49:17 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-01 02:18:39 +0200
commitae281cbd2689200329afe2474b2f39f3f6eb54b9 (patch)
treeccf24acc47e81a4321491089c28b34101ced6dfb /arch/arm64/kernel/time.c
parentclocksource: Add new CLKSRC_{PROBE,ACPI} config symbols (diff)
downloadlinux-ae281cbd2689200329afe2474b2f39f3f6eb54b9.tar.xz
linux-ae281cbd2689200329afe2474b2f39f3f6eb54b9.zip
clocksource / arm_arch_timer: Convert to ACPI probing
It is now absolutely trivial to convert the arch timer driver to use ACPI probing, just like its DT counterpart. Let's enjoy another crapectomy. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/arm64/kernel/time.c')
-rw-r--r--arch/arm64/kernel/time.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
index 149151fb42bb..819a105d3085 100644
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -71,12 +71,6 @@ void __init time_init(void)
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");