diff options
author | Mark Rutland <mark.rutland@arm.com> | 2012-11-20 11:06:00 +0100 |
---|---|---|
committer | Mark Rutland <mark.rutland@arm.com> | 2013-01-31 16:51:59 +0100 |
commit | 1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2 (patch) | |
tree | ac02d4cdc545251cb9197456c7fbd41a64a4dbe0 /drivers/clocksource/arm_arch_timer.c | |
parent | arm64: arm_generic: prevent reading stale time (diff) | |
download | linux-1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2.tar.xz linux-1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2.zip |
arm64: move from arm_generic to arm_arch_timer
The arch_timer driver supports a superset of the functionality of the
arm_generic driver, and is not tied to a particular arch.
This patch moves arm64 to use the arch_timer driver, gaining additional
functionality in doing so, and removes the (now unused) arm_generic
driver. Timer-related hooks specific to arm64 are moved into
arch/arm64/kernel/time.c.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'drivers/clocksource/arm_arch_timer.c')
-rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 3e4739df0e82..ec30a7331587 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -338,6 +338,7 @@ out: static const struct of_device_id arch_timer_of_match[] __initconst = { { .compatible = "arm,armv7-timer", }, + { .compatible = "arm,armv8-timer", }, {}, }; |