diff options
| author | Andrew Victor | 2006-09-27 14:23:00 +0200 |
|---|---|---|
| committer | Russell King | 2006-09-28 12:53:47 +0200 |
| commit | f21738341ca330ec83ef978ee63ffa5ecf13f082 (patch) | |
| tree | be42abeb9ef2509a5a0c4187f4aa076d8f3c2dee /arch/arm/mach-at91rm9200/board-carmeva.c | |
| parent | [ARM] 3866/1: AT91 clock update (diff) | |
| download | kernel-qcow2-linux-f21738341ca330ec83ef978ee63ffa5ecf13f082.tar.gz kernel-qcow2-linux-f21738341ca330ec83ef978ee63ffa5ecf13f082.tar.xz kernel-qcow2-linux-f21738341ca330ec83ef978ee63ffa5ecf13f082.zip | |
[ARM] 3867/1: AT91 GPIO update
This patch makes the AT91 gpio.c support processor-generic (AT91RM9200
and AT91SAM9xxx). The GPIO controllers supported by a particular AT91
processor are defined in the processor-specific file and are registered
with gpio.c at startup.
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91rm9200/board-carmeva.c')
| -rw-r--r-- | arch/arm/mach-at91rm9200/board-carmeva.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm/mach-at91rm9200/board-carmeva.c b/arch/arm/mach-at91rm9200/board-carmeva.c index 6af252bcb083..50e513681ae6 100644 --- a/arch/arm/mach-at91rm9200/board-carmeva.c +++ b/arch/arm/mach-at91rm9200/board-carmeva.c @@ -40,14 +40,6 @@ #include "generic.h" -static void __init carmeva_init_irq(void) -{ - /* Initialize AIC controller */ - at91rm9200_init_irq(NULL); - - /* Set up the GPIO interrupts */ - at91_gpio_irq_setup(BGA_GPIO_BANKS); -} /* * Serial port configuration. @@ -63,12 +55,18 @@ static struct at91_uart_config __initdata carmeva_uart_config = { static void __init carmeva_map_io(void) { /* Initialize processor: 20.000 MHz crystal */ - at91rm9200_initialize(20000000); + at91rm9200_initialize(20000000, AT91RM9200_BGA); /* Setup the serial ports and console */ at91_init_serial(&carmeva_uart_config); } +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, |