diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-18 11:06:02 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-05 09:55:31 +0100 |
| commit | 0813069d03f312b48b836f20e7f12073288f0f82 (patch) | |
| tree | 8f04587c29096e0246654d4458a3857b08156be0 /arch/arm/mach-nomadik/board-nhk8815.c | |
| parent | b7a5bcd5cdef34093f340029a1a097c136c5369b (diff) | |
| download | talos-obmc-linux-0813069d03f312b48b836f20e7f12073288f0f82.tar.gz talos-obmc-linux-0813069d03f312b48b836f20e7f12073288f0f82.zip | |
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/mach-nomadik/board-nhk8815.c')
| -rw-r--r-- | arch/arm/mach-nomadik/board-nhk8815.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 22ef8a1abe08..16f10e04a805 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -29,7 +29,6 @@ #include <asm/sizes.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/irq.h> #include <asm/mach/flash.h> #include <asm/mach/time.h> @@ -37,6 +36,7 @@ #include <linux/platform_data/mtd-nomadik-nand.h> #include <mach/fsmc.h> +#include <mach/irqs.h> #include "cpu-8815.h" @@ -260,7 +260,7 @@ static void __init nomadik_timer_init(void) src_cr |= SRC_CR_INIT_VAL; writel(src_cr, io_p2v(NOMADIK_SRC_BASE)); - nmdk_timer_init(io_p2v(NOMADIK_MTU0_BASE)); + nmdk_timer_init(io_p2v(NOMADIK_MTU0_BASE), IRQ_MTU0); } static struct sys_timer nomadik_timer = { |
