diff options
author | Andrew Victor <andrew@sanpeople.com> | 2006-09-27 08:23:00 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-28 06:53:47 -0400 |
commit | f21738341ca330ec83ef978ee63ffa5ecf13f082 (patch) | |
tree | be42abeb9ef2509a5a0c4187f4aa076d8f3c2dee /arch/arm/mach-at91rm9200/board-kafa.c | |
parent | 2eeaaa21de68cb8869d3a54438a9224321d3dd03 (diff) |
[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-kafa.c')
-rw-r--r-- | arch/arm/mach-at91rm9200/board-kafa.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/mach-at91rm9200/board-kafa.c b/arch/arm/mach-at91rm9200/board-kafa.c index d9a6b7e7d63a..91e301924f2c 100644 --- a/arch/arm/mach-at91rm9200/board-kafa.c +++ b/arch/arm/mach-at91rm9200/board-kafa.c | |||
@@ -39,14 +39,6 @@ | |||
39 | 39 | ||
40 | #include "generic.h" | 40 | #include "generic.h" |
41 | 41 | ||
42 | static void __init kafa_init_irq(void) | ||
43 | { | ||
44 | /* Initialize AIC controller */ | ||
45 | at91rm9200_init_irq(NULL); | ||
46 | |||
47 | /* Set up the GPIO interrupts */ | ||
48 | at91_gpio_irq_setup(PQFP_GPIO_BANKS); | ||
49 | } | ||
50 | 42 | ||
51 | /* | 43 | /* |
52 | * Serial port configuration. | 44 | * Serial port configuration. |
@@ -62,7 +54,7 @@ static struct at91_uart_config __initdata kafa_uart_config = { | |||
62 | static void __init kafa_map_io(void) | 54 | static void __init kafa_map_io(void) |
63 | { | 55 | { |
64 | /* Initialize processor: 18.432 MHz crystal */ | 56 | /* Initialize processor: 18.432 MHz crystal */ |
65 | at91rm9200_initialize(18432000); | 57 | at91rm9200_initialize(18432000, AT91RM9200_PQFP); |
66 | 58 | ||
67 | /* Set up the LEDs */ | 59 | /* Set up the LEDs */ |
68 | at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4); | 60 | at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4); |
@@ -71,6 +63,11 @@ static void __init kafa_map_io(void) | |||
71 | at91_init_serial(&kafa_uart_config); | 63 | at91_init_serial(&kafa_uart_config); |
72 | } | 64 | } |
73 | 65 | ||
66 | static void __init kafa_init_irq(void) | ||
67 | { | ||
68 | at91rm9200_init_interrupts(NULL); | ||
69 | } | ||
70 | |||
74 | static struct at91_eth_data __initdata kafa_eth_data = { | 71 | static struct at91_eth_data __initdata kafa_eth_data = { |
75 | .phy_irq_pin = AT91_PIN_PC4, | 72 | .phy_irq_pin = AT91_PIN_PC4, |
76 | .is_rmii = 0, | 73 | .is_rmii = 0, |