diff options
Diffstat (limited to 'arch/arm/mach-at91/board-carmeva.c')
-rw-r--r-- | arch/arm/mach-at91/board-carmeva.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c index 774c87f..f36b186 100644 --- a/arch/arm/mach-at91/board-carmeva.c +++ b/arch/arm/mach-at91/board-carmeva.c @@ -20,7 +20,6 @@ */ #include <linux/types.h> -#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h> @@ -36,6 +35,7 @@ #include <mach/hardware.h> #include <mach/board.h> +#include <mach/gpio.h> #include "generic.h" @@ -43,7 +43,7 @@ static void __init carmeva_init_early(void) { /* Initialize processor: 20.000 MHz crystal */ - at91_initialize(20000000); + at91rm9200_initialize(20000000); /* DBGU on ttyS0. (Rx & Tx only) */ at91_register_uart(0, 0, 0); @@ -57,6 +57,11 @@ static void __init carmeva_init_early(void) at91_set_serial_console(0); } +static void __init carmeva_init_irq(void) +{ + at91rm9200_init_interrupts(NULL); +} + static struct at91_eth_data __initdata carmeva_eth_data = { .phy_irq_pin = AT91_PIN_PC4, .is_rmii = 1, @@ -158,8 +163,8 @@ static void __init carmeva_board_init(void) MACHINE_START(CARMEVA, "Carmeva") /* Maintainer: Conitec Datasystems */ .timer = &at91rm9200_timer, - .map_io = at91_map_io, + .map_io = at91rm9200_map_io, .init_early = carmeva_init_early, - .init_irq = at91_init_irq_default, + .init_irq = carmeva_init_irq, .init_machine = carmeva_board_init, MACHINE_END |