diff options
Diffstat (limited to 'arch/arm/mach-at91/board-sam9260ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9260ek.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index 5c240743c5b7..8a50c3e67186 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c | |||
@@ -53,7 +53,7 @@ | |||
53 | static void __init ek_init_early(void) | 53 | static void __init ek_init_early(void) |
54 | { | 54 | { |
55 | /* Initialize processor: 18.432 MHz crystal */ | 55 | /* Initialize processor: 18.432 MHz crystal */ |
56 | at91sam9260_initialize(18432000); | 56 | at91_initialize(18432000); |
57 | 57 | ||
58 | /* DBGU on ttyS0. (Rx & Tx only) */ | 58 | /* DBGU on ttyS0. (Rx & Tx only) */ |
59 | at91_register_uart(0, 0, 0); | 59 | at91_register_uart(0, 0, 0); |
@@ -70,12 +70,6 @@ static void __init ek_init_early(void) | |||
70 | at91_set_serial_console(0); | 70 | at91_set_serial_console(0); |
71 | } | 71 | } |
72 | 72 | ||
73 | static void __init ek_init_irq(void) | ||
74 | { | ||
75 | at91sam9260_init_interrupts(NULL); | ||
76 | } | ||
77 | |||
78 | |||
79 | /* | 73 | /* |
80 | * USB Host port | 74 | * USB Host port |
81 | */ | 75 | */ |
@@ -354,8 +348,8 @@ static void __init ek_board_init(void) | |||
354 | MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK") | 348 | MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK") |
355 | /* Maintainer: Atmel */ | 349 | /* Maintainer: Atmel */ |
356 | .timer = &at91sam926x_timer, | 350 | .timer = &at91sam926x_timer, |
357 | .map_io = at91sam9260_map_io, | 351 | .map_io = at91_map_io, |
358 | .init_early = ek_init_early, | 352 | .init_early = ek_init_early, |
359 | .init_irq = ek_init_irq, | 353 | .init_irq = at91_init_irq_default, |
360 | .init_machine = ek_board_init, | 354 | .init_machine = ek_board_init, |
361 | MACHINE_END | 355 | MACHINE_END |