diff options
author | Tony Lindgren <tony@atomide.com> | 2011-03-29 15:54:49 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-06-27 12:14:01 -0700 |
commit | 0c336dc5ec492886620d4afdc252c63f32adbd0e (patch) | |
tree | 3d2a793b30a6c979bafd688896c634ea3d0d835a /arch/arm/mach-omap2/timer-gp.c | |
parent | 3d05a3e80c44cb792fc8194fd9abdb431dea5420 (diff) | |
download | op-kernel-dev-0c336dc5ec492886620d4afdc252c63f32adbd0e.zip op-kernel-dev-0c336dc5ec492886620d4afdc252c63f32adbd0e.tar.gz |
omap2+: Remove omap2_gp_clockevent_set_gptimer
This is no longer needed as we now just set the desired
.timer in MACHINE_START. We can now also remove timer-gp.h.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/timer-gp.c')
-rw-r--r-- | arch/arm/mach-omap2/timer-gp.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index 2b8cb70..ab1931c 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c @@ -43,8 +43,6 @@ #include <plat/common.h> #include <plat/omap_hwmod.h> -#include "timer-gp.h" - /* Parent clocks, eventually these will come from the clock framework */ #define OMAP2_MPU_SOURCE "sys_ck" @@ -75,8 +73,6 @@ u32 sys_timer_reserved; static struct omap_dm_timer clkev; static struct clock_event_device clockevent_gpt; -static u8 __initdata gptimer_id = 1; -static u8 __initdata inited; static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id) { @@ -138,26 +134,6 @@ static struct clock_event_device clockevent_gpt = { .set_mode = omap2_gp_timer_set_mode, }; -/** - * omap2_gp_clockevent_set_gptimer - set which GPTIMER is used for clockevents - * @id: GPTIMER to use (1..MAX_GPTIMER_ID) - * - * Define the GPTIMER that the system should use for the tick timer. - * Meant to be called from board-*.c files in the event that GPTIMER1, the - * default, is unsuitable. Returns -EINVAL on error or 0 on success. - */ -int __init omap2_gp_clockevent_set_gptimer(u8 id) -{ - if (id < 1 || id > MAX_GPTIMER_ID) - return -EINVAL; - - BUG_ON(inited); - - gptimer_id = id; - - return 0; -} - static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, int gptimer_id, const char *fck_source) @@ -228,8 +204,6 @@ static void __init omap2_gp_clockevent_init(int gptimer_id, { int res; - inited = 1; - res = omap_dm_timer_init_one(&clkev, gptimer_id, fck_source); BUG_ON(res); |