diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-18 05:06:02 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-05 03:55:31 -0500 |
commit | 0813069d03f312b48b836f20e7f12073288f0f82 (patch) | |
tree | 8f04587c29096e0246654d4458a3857b08156be0 /arch/arm/plat-nomadik/timer.c | |
parent | b7a5bcd5cdef34093f340029a1a097c136c5369b (diff) |
ARM: plat-nomadik: pass IRQ to timer driver
In order to convert the MTU timer to work with sparse IRQ we need
to pass the IRQ used when initializing instead of just letting
it rely on a special name being used in the IRQ header file.
Cc: Alessandro Rubini <rubini@unipv.it>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/plat-nomadik/timer.c')
-rw-r--r-- | arch/arm/plat-nomadik/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-nomadik/timer.c b/arch/arm/plat-nomadik/timer.c index 9222e5522a43..0ae2b068ee0f 100644 --- a/arch/arm/plat-nomadik/timer.c +++ b/arch/arm/plat-nomadik/timer.c | |||
@@ -174,7 +174,7 @@ void nmdk_clksrc_reset(void) | |||
174 | mtu_base + MTU_CR(0)); | 174 | mtu_base + MTU_CR(0)); |
175 | } | 175 | } |
176 | 176 | ||
177 | void __init nmdk_timer_init(void __iomem *base) | 177 | void __init nmdk_timer_init(void __iomem *base, int irq) |
178 | { | 178 | { |
179 | unsigned long rate; | 179 | unsigned long rate; |
180 | struct clk *clk0; | 180 | struct clk *clk0; |
@@ -217,7 +217,7 @@ void __init nmdk_timer_init(void __iomem *base) | |||
217 | #endif | 217 | #endif |
218 | 218 | ||
219 | /* Timer 1 is used for events, register irq and clockevents */ | 219 | /* Timer 1 is used for events, register irq and clockevents */ |
220 | setup_irq(IRQ_MTU0, &nmdk_timer_irq); | 220 | setup_irq(irq, &nmdk_timer_irq); |
221 | nmdk_clkevt.cpumask = cpumask_of(0); | 221 | nmdk_clkevt.cpumask = cpumask_of(0); |
222 | clockevents_config_and_register(&nmdk_clkevt, rate, 2, 0xffffffffU); | 222 | clockevents_config_and_register(&nmdk_clkevt, rate, 2, 0xffffffffU); |
223 | } | 223 | } |