diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-03-06 07:17:10 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-03-06 07:17:10 -0800 |
| commit | 0d53cc8b3319fc6d0d9656c428d03a3c1628c19f (patch) | |
| tree | ad0c9123530902dfb1b67eafcc44a7eb13468ecd /arch/arm/mach-omap2 | |
| parent | f4a5ac7bd96f13b67e0f554c3c7f1b6740e3dbdf (diff) | |
| parent | b75ca5217743e4d7076cf65e044e88389e44318d (diff) | |
Merge branch 'omap-for-v5.7/omap1' into omap-for-v5.7/soc
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 0d0a731cb476..8b09cdacc30d 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -91,12 +91,6 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction omap2_gp_timer_irq = { - .name = "gp_timer", - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .handler = omap2_gp_timer_interrupt, -}; - static int omap2_gp_timer_set_next_event(unsigned long cycles, struct clock_event_device *evt) { @@ -382,8 +376,9 @@ static void __init omap2_gp_clockevent_init(int gptimer_id, &clockevent_gpt.name, OMAP_TIMER_POSTED); BUG_ON(res); - omap2_gp_timer_irq.dev_id = &clkev; - setup_irq(clkev.irq, &omap2_gp_timer_irq); + if (request_irq(clkev.irq, omap2_gp_timer_interrupt, + IRQF_TIMER | IRQF_IRQPOLL, "gp_timer", &clkev)) + pr_err("Failed to request irq %d (gp_timer)\n", clkev.irq); __omap_dm_timer_int_enable(&clkev, OMAP_TIMER_INT_OVERFLOW); |