diff options
Diffstat (limited to 'arch/arm/mach-at91/board-foxg20.c')
| -rw-r--r-- | arch/arm/mach-at91/board-foxg20.c | 71 | 
1 files changed, 33 insertions, 38 deletions
diff --git a/arch/arm/mach-at91/board-foxg20.c b/arch/arm/mach-at91/board-foxg20.c index caf017f0f4e..33411e6ecb1 100644 --- a/arch/arm/mach-at91/board-foxg20.c +++ b/arch/arm/mach-at91/board-foxg20.c @@ -61,44 +61,6 @@ static void __init foxg20_init_early(void)  {  	/* Initialize processor: 18.432 MHz crystal */  	at91_initialize(18432000); - -	/* DBGU on ttyS0. (Rx & Tx only) */ -	at91_register_uart(0, 0, 0); - -	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ -	at91_register_uart(AT91SAM9260_ID_US0, 1, -				ATMEL_UART_CTS -				| ATMEL_UART_RTS -				| ATMEL_UART_DTR -				| ATMEL_UART_DSR -				| ATMEL_UART_DCD -				| ATMEL_UART_RI); - -	/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ -	at91_register_uart(AT91SAM9260_ID_US1, 2, -		ATMEL_UART_CTS -		| ATMEL_UART_RTS); - -	/* USART2 on ttyS3. (Rx & Tx only) */ -	at91_register_uart(AT91SAM9260_ID_US2, 3, 0); - -	/* USART3 on ttyS4. (Rx, Tx, RTS, CTS) */ -	at91_register_uart(AT91SAM9260_ID_US3, 4, -		ATMEL_UART_CTS -		| ATMEL_UART_RTS); - -	/* USART4 on ttyS5. (Rx & Tx only) */ -	at91_register_uart(AT91SAM9260_ID_US4, 5, 0); - -	/* USART5 on ttyS6. (Rx & Tx only) */ -	at91_register_uart(AT91SAM9260_ID_US5, 6, 0); - -	/* set serial console to ttyS0 (ie, DBGU) */ -	at91_set_serial_console(0); - -	/* Set the internal pull-up resistor on DRXD */ -	at91_set_A_periph(AT91_PIN_PB14, 1); -  }  /* @@ -241,6 +203,39 @@ static struct i2c_board_info __initdata foxg20_i2c_devices[] = {  static void __init foxg20_board_init(void)  {  	/* Serial */ +	/* DBGU on ttyS0. (Rx & Tx only) */ +	at91_register_uart(0, 0, 0); + +	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ +	at91_register_uart(AT91SAM9260_ID_US0, 1, +				ATMEL_UART_CTS +				| ATMEL_UART_RTS +				| ATMEL_UART_DTR +				| ATMEL_UART_DSR +				| ATMEL_UART_DCD +				| ATMEL_UART_RI); + +	/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ +	at91_register_uart(AT91SAM9260_ID_US1, 2, +		ATMEL_UART_CTS +		| ATMEL_UART_RTS); + +	/* USART2 on ttyS3. (Rx & Tx only) */ +	at91_register_uart(AT91SAM9260_ID_US2, 3, 0); + +	/* USART3 on ttyS4. (Rx, Tx, RTS, CTS) */ +	at91_register_uart(AT91SAM9260_ID_US3, 4, +		ATMEL_UART_CTS +		| ATMEL_UART_RTS); + +	/* USART4 on ttyS5. (Rx & Tx only) */ +	at91_register_uart(AT91SAM9260_ID_US4, 5, 0); + +	/* USART5 on ttyS6. (Rx & Tx only) */ +	at91_register_uart(AT91SAM9260_ID_US5, 6, 0); + +	/* Set the internal pull-up resistor on DRXD */ +	at91_set_A_periph(AT91_PIN_PB14, 1);  	at91_add_device_serial();  	/* USB Host */  	at91_add_device_usbh(&foxg20_usbh_data);  |