diff options
Diffstat (limited to 'arch/arm/mach-at91/board-cpu9krea.c')
| -rw-r--r-- | arch/arm/mach-at91/board-cpu9krea.c | 52 | 
1 files changed, 24 insertions, 28 deletions
diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c index 5f3680e7c88..69951ec7dbf 100644 --- a/arch/arm/mach-at91/board-cpu9krea.c +++ b/arch/arm/mach-at91/board-cpu9krea.c @@ -52,34 +52,6 @@ static void __init cpu9krea_init_early(void)  {  	/* Initialize processor: 18.432 MHz crystal */  	at91_initialize(18432000); - -	/* DGBU 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, RTS, CTS) */ -	at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_CTS | -		ATMEL_UART_RTS); - -	/* USART3 on ttyS4. (Rx, Tx) */ -	at91_register_uart(AT91SAM9260_ID_US3, 4, 0); - -	/* USART4 on ttyS5. (Rx, Tx) */ -	at91_register_uart(AT91SAM9260_ID_US4, 5, 0); - -	/* USART5 on ttyS6. (Rx, Tx) */ -	at91_register_uart(AT91SAM9260_ID_US5, 6, 0); - -	/* set serial console to ttyS0 (ie, DBGU) */ -	at91_set_serial_console(0);  }  /* @@ -352,6 +324,30 @@ static void __init cpu9krea_board_init(void)  	/* NOR */  	cpu9krea_add_device_nor();  	/* Serial */ +	/* DGBU 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, RTS, CTS) */ +	at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_CTS | +		ATMEL_UART_RTS); + +	/* USART3 on ttyS4. (Rx, Tx) */ +	at91_register_uart(AT91SAM9260_ID_US3, 4, 0); + +	/* USART4 on ttyS5. (Rx, Tx) */ +	at91_register_uart(AT91SAM9260_ID_US4, 5, 0); + +	/* USART5 on ttyS6. (Rx, Tx) */ +	at91_register_uart(AT91SAM9260_ID_US5, 6, 0);  	at91_add_device_serial();  	/* USB Host */  	at91_add_device_usbh(&cpu9krea_usbh_data);  |