OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: architected timers: remove support for non DT platforms 

All mainline platforms using the ARM architected timers are DT
only. As such, remove the ad-hoc support that is not longer needed
anymore.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Marc Zyngier 2012-04-27 13:18:42 +01:00
parent 120f3d6c23
commit fb8a99f9f6
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/include/asm/arch_timer.h
View File

@ -1,22 +1,10 @@
#ifndef __ASMARM_ARCH_TIMER_H
#define __ASMARM_ARCH_TIMER_H
#include <linux/ioport.h>
struct arch_timer {
struct resource res[2];
};
#ifdef CONFIG_ARM_ARCH_TIMER
int arch_timer_register(struct arch_timer *);
int arch_timer_sched_clock_init(void);
int arch_timer_of_register(void);
int arch_timer_sched_clock_init(void);
#else
static inline int arch_timer_register(struct arch_timer *at)
{
return -ENXIO;
}
static inline int arch_timer_of_register(void)
{
return -ENXIO;

19
arch/arm/kernel/arch_timer.c
View File

@ -248,7 +248,7 @@ static struct local_timer_ops arch_timer_ops __cpuinitdata = {
static struct clock_event_device arch_timer_global_evt;
static int __init arch_timer_common_register(void)
static int __init arch_timer_register(void)
{
int err;
@ -309,20 +309,6 @@ out_free:
return err;
}
int __init arch_timer_register(struct arch_timer *at)
{
if (at->res[0].start <= 0 || !(at->res[0].flags & IORESOURCE_IRQ))
return -EINVAL;
arch_timer_ppi = at->res[0].start;
if (at->res[1].start > 0 || (at->res[1].flags & IORESOURCE_IRQ))
arch_timer_ppi2 = at->res[1].start;
return arch_timer_common_register();
}
#ifdef CONFIG_OF
static const struct of_device_id arch_timer_of_match[] __initconst = {
{ .compatible = "arm,armv7-timer", },
{},
@ -348,9 +334,8 @@ int __init arch_timer_of_register(void)
pr_info("arch_timer: found %s irqs %d %d\n",
np->name, arch_timer_ppi, arch_timer_ppi2);
return arch_timer_common_register();
return arch_timer_register();
}
#endif
int __init arch_timer_sched_clock_init(void)
{