diff options
Diffstat (limited to 'arch/arm/mach-at91/board-snapper9260.c')
-rw-r--r-- | arch/arm/mach-at91/board-snapper9260.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c index ebc9d01ce742..9d446f1bb45f 100644 --- a/arch/arm/mach-at91/board-snapper9260.c +++ b/arch/arm/mach-at91/board-snapper9260.c | |||
@@ -43,16 +43,6 @@ | |||
43 | static void __init snapper9260_init_early(void) | 43 | static void __init snapper9260_init_early(void) |
44 | { | 44 | { |
45 | at91_initialize(18432000); | 45 | at91_initialize(18432000); |
46 | |||
47 | /* Debug on ttyS0 */ | ||
48 | at91_register_uart(0, 0, 0); | ||
49 | at91_set_serial_console(0); | ||
50 | |||
51 | at91_register_uart(AT91SAM9260_ID_US0, 1, | ||
52 | ATMEL_UART_CTS | ATMEL_UART_RTS); | ||
53 | at91_register_uart(AT91SAM9260_ID_US1, 2, | ||
54 | ATMEL_UART_CTS | ATMEL_UART_RTS); | ||
55 | at91_register_uart(AT91SAM9260_ID_US2, 3, 0); | ||
56 | } | 46 | } |
57 | 47 | ||
58 | static struct at91_usbh_data __initdata snapper9260_usbh_data = { | 48 | static struct at91_usbh_data __initdata snapper9260_usbh_data = { |
@@ -168,6 +158,14 @@ static void __init snapper9260_board_init(void) | |||
168 | snapper9260_i2c_isl1208.irq = gpio_to_irq(AT91_PIN_PA31); | 158 | snapper9260_i2c_isl1208.irq = gpio_to_irq(AT91_PIN_PA31); |
169 | i2c_register_board_info(0, &snapper9260_i2c_isl1208, 1); | 159 | i2c_register_board_info(0, &snapper9260_i2c_isl1208, 1); |
170 | 160 | ||
161 | /* Debug on ttyS0 */ | ||
162 | at91_register_uart(0, 0, 0); | ||
163 | |||
164 | at91_register_uart(AT91SAM9260_ID_US0, 1, | ||
165 | ATMEL_UART_CTS | ATMEL_UART_RTS); | ||
166 | at91_register_uart(AT91SAM9260_ID_US1, 2, | ||
167 | ATMEL_UART_CTS | ATMEL_UART_RTS); | ||
168 | at91_register_uart(AT91SAM9260_ID_US2, 3, 0); | ||
171 | at91_add_device_serial(); | 169 | at91_add_device_serial(); |
172 | at91_add_device_usbh(&snapper9260_usbh_data); | 170 | at91_add_device_usbh(&snapper9260_usbh_data); |
173 | at91_add_device_udc(&snapper9260_udc_data); | 171 | at91_add_device_udc(&snapper9260_udc_data); |