diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2011-08-04 11:57:04 +0100 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2012-03-13 13:29:58 +0000 |
| commit | 7c380f273cf09b202e4bc9cbe137aef1870b8a20 (patch) | |
| tree | 1731276247100c90a24462f08bf1c722e1573c39 /arch/arm/plat-versatile | |
| parent | a45c983f85328be9d0540a6b8250609dbf16872c (diff) | |
| download | linux-stable-7c380f273cf09b202e4bc9cbe137aef1870b8a20.tar.gz linux-stable-7c380f273cf09b202e4bc9cbe137aef1870b8a20.tar.bz2 linux-stable-7c380f273cf09b202e4bc9cbe137aef1870b8a20.zip | |
ARM: plat-versatile: convert to twd_local_timer_register() interface
Add support for the new smp_twd runtime registration interface
to the RealView/VE platforms, and remove the old compile-time support.
Tested on EB11MP.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/plat-versatile')
| -rw-r--r-- | arch/arm/plat-versatile/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/plat-versatile/localtimer.c | 53 |
2 files changed, 0 insertions, 54 deletions
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile index 69714db47c33..a5cb1945bdcc 100644 --- a/arch/arm/plat-versatile/Makefile +++ b/arch/arm/plat-versatile/Makefile @@ -1,5 +1,4 @@ obj-y := clock.o -obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o diff --git a/arch/arm/plat-versatile/localtimer.c b/arch/arm/plat-versatile/localtimer.c deleted file mode 100644 index e15668793159..000000000000 --- a/arch/arm/plat-versatile/localtimer.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * linux/arch/arm/plat-versatile/localtimer.c - * - * Copyright (C) 2002 ARM Ltd. - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#include <linux/init.h> -#include <linux/smp.h> -#include <linux/clockchips.h> -#include <linux/of.h> -#include <linux/of_address.h> - -#include <asm/smp_twd.h> -#include <asm/localtimer.h> -#include <mach/irqs.h> - -const static struct of_device_id twd_of_match[] __initconst = { - { .compatible = "arm,cortex-a9-twd-timer", }, - { .compatible = "arm,cortex-a5-twd-timer", }, - { .compatible = "arm,arm11mp-twd-timer", }, - { }, -}; - -/* - * Setup the local clock events for a CPU. - */ -int __cpuinit local_timer_setup(struct clock_event_device *evt) -{ -#if defined(CONFIG_OF) - static int dt_node_probed; - - /* Look for TWD node only once */ - if (!dt_node_probed) { - struct device_node *node = of_find_matching_node(NULL, - twd_of_match); - - if (node) - twd_base = of_iomap(node, 0); - - dt_node_probed = 1; - } -#endif - if (!twd_base) - return -ENXIO; - - evt->irq = IRQ_LOCALTIMER; - twd_timer_setup(evt); - return 0; -} |