diff options
| author | Sudeep Holla <sudeep.holla@arm.com> | 2015-05-18 17:29:40 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-02 10:58:18 +0200 |
| commit | 0b7402dce445ba0d11401c2cb806e8fc260c9e49 (patch) | |
| tree | 0874f7fb02dd4707840eece7ade0b61628041ae6 /drivers/clocksource/timer-integrator-ap.c | |
| parent | ARM: 8365/1: introduce sp804_timer_disable and remove arm_timer.h inclusion (diff) | |
| download | linux-0b7402dce445ba0d11401c2cb806e8fc260c9e49.tar.xz linux-0b7402dce445ba0d11401c2cb806e8fc260c9e49.zip | |
ARM: 8366/1: move Dual-Timer SP804 driver to drivers/clocksource
The ARM Dual-Timer SP804 module is peripheral found not only on ARM32
platforms but also on ARM64 platforms.
This patch moves the driver out of arch/arm to driver/clocksource
so that it can be used on ARM64 platforms also.
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Olof Johansson <olof@lixom.net>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/clocksource/timer-integrator-ap.c')
| -rw-r--r-- | drivers/clocksource/timer-integrator-ap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c index b9efd30513d5..d7d21e4dcef0 100644 --- a/drivers/clocksource/timer-integrator-ap.c +++ b/drivers/clocksource/timer-integrator-ap.c @@ -26,7 +26,8 @@ #include <linux/clockchips.h> #include <linux/interrupt.h> #include <linux/sched_clock.h> -#include <asm/hardware/arm_timer.h> + +#include "timer-sp.h" static void __iomem * sched_clk_base; |