aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/timer-gp.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-03-29 18:54:49 -0400
committerTony Lindgren <tony@atomide.com>2011-06-20 04:25:39 -0400
commit98e182a26bbbf5575457622337684ef61493e864 (patch)
tree85e56b2df1092c1854b00497b75ab79867ea2829 /arch/arm/mach-omap2/timer-gp.c
parentaa56188998942dfd1d6d85484c87f79268508bba (diff)
omap2+: Remove gptimer_wakeup for now
This removes the support for setting the wake-up timer for debugging. Later on we can reserve gptimer1 for PM code only and have similar functionality. 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.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 62c0d5cb25f7..578e9df4fdea 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -72,11 +72,9 @@
72/* Clockevent code */ 72/* Clockevent code */
73 73
74static struct omap_dm_timer clkev; 74static struct omap_dm_timer clkev;
75static struct omap_dm_timer *gptimer;
76static struct clock_event_device clockevent_gpt; 75static struct clock_event_device clockevent_gpt;
77static u8 __initdata gptimer_id = 1; 76static u8 __initdata gptimer_id = 1;
78static u8 __initdata inited; 77static u8 __initdata inited;
79struct omap_dm_timer *gptimer_wakeup;
80 78
81static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id) 79static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id)
82{ 80{
@@ -218,10 +216,6 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
218 216
219 timer->reserved = 1; 217 timer->reserved = 1;
220 218
221 gptimer = omap_dm_timer_request_specific(gptimer_id);
222 BUG_ON(gptimer == NULL);
223 gptimer_wakeup = gptimer;
224
225 return res; 219 return res;
226} 220}
227 221
@@ -235,7 +229,7 @@ static void __init omap2_gp_clockevent_init(int gptimer_id,
235 res = omap_dm_timer_init_one(&clkev, gptimer_id, fck_source); 229 res = omap_dm_timer_init_one(&clkev, gptimer_id, fck_source);
236 BUG_ON(res); 230 BUG_ON(res);
237 231
238 omap2_gp_timer_irq.dev_id = (void *)gptimer; 232 omap2_gp_timer_irq.dev_id = (void *)&clkev;
239 setup_irq(clkev.irq, &omap2_gp_timer_irq); 233 setup_irq(clkev.irq, &omap2_gp_timer_irq);
240 234
241 __omap_dm_timer_int_enable(clkev.io_base, OMAP_TIMER_INT_OVERFLOW); 235 __omap_dm_timer_int_enable(clkev.io_base, OMAP_TIMER_INT_OVERFLOW);