aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-pcontrol-g20.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-at91/board-pcontrol-g20.c')
-rw-r--r--arch/arm/mach-at91/board-pcontrol-g20.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c
index feb65787c30b..df1ed7e2806b 100644
--- a/arch/arm/mach-at91/board-pcontrol-g20.c
+++ b/arch/arm/mach-at91/board-pcontrol-g20.c
@@ -37,9 +37,9 @@
37#include "generic.h" 37#include "generic.h"
38 38
39 39
40static void __init pcontrol_g20_map_io(void) 40static void __init pcontrol_g20_init_early(void)
41{ 41{
42 stamp9g20_map_io(); 42 stamp9g20_init_early();
43 43
44 /* USART0 on ttyS1. (Rx, Tx, CTS, RTS) piggyback A2 */ 44 /* USART0 on ttyS1. (Rx, Tx, CTS, RTS) piggyback A2 */
45 at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS 45 at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS
@@ -224,7 +224,8 @@ MACHINE_START(PCONTROL_G20, "PControl G20")
224 /* Maintainer: pgsellmann@portner-elektronik.at */ 224 /* Maintainer: pgsellmann@portner-elektronik.at */
225 .boot_params = AT91_SDRAM_BASE + 0x100, 225 .boot_params = AT91_SDRAM_BASE + 0x100,
226 .timer = &at91sam926x_timer, 226 .timer = &at91sam926x_timer,
227 .map_io = pcontrol_g20_map_io, 227 .map_io = at91sam9260_map_io,
228 .init_early = pcontrol_g20_init_early,
228 .init_irq = init_irq, 229 .init_irq = init_irq,
229 .init_machine = pcontrol_g20_board_init, 230 .init_machine = pcontrol_g20_board_init,
230MACHINE_END 231MACHINE_END