diff options
Diffstat (limited to 'arch/arm/mach-at91/board-gsia18s.c')
| -rw-r--r-- | arch/arm/mach-at91/board-gsia18s.c | 63 | 
1 files changed, 31 insertions, 32 deletions
diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c index 230e71969fb..3e0dfa643a8 100644 --- a/arch/arm/mach-at91/board-gsia18s.c +++ b/arch/arm/mach-at91/board-gsia18s.c @@ -41,38 +41,6 @@  static void __init gsia18s_init_early(void)  {  	stamp9g20_init_early(); - -	/* -	 * USART0 on ttyS1 (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI). -	 * Used for Internal Analog Modem. -	 */ -	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, CTS, RTS). -	 * Used for GPS or WiFi or Data stream. -	 */ -	at91_register_uart(AT91SAM9260_ID_US1, 2, -				ATMEL_UART_CTS | ATMEL_UART_RTS); -	/* -	 * USART2 on ttyS3 (Rx, Tx, CTS, RTS). -	 * Used for External Modem. -	 */ -	at91_register_uart(AT91SAM9260_ID_US2, 3, -				ATMEL_UART_CTS | ATMEL_UART_RTS); -	/* -	 * USART3 on ttyS4 (Rx, Tx, RTS). -	 * Used for RS-485. -	 */ -	at91_register_uart(AT91SAM9260_ID_US3, 4, ATMEL_UART_RTS); - -	/* -	 * USART4 on ttyS5 (Rx, Tx). -	 * Used for TRX433 Radio Module. -	 */ -	at91_register_uart(AT91SAM9260_ID_US4, 5, 0);  }  /* @@ -558,6 +526,37 @@ static int __init gsia18s_power_off_init(void)  static void __init gsia18s_board_init(void)  { +	/* +	 * USART0 on ttyS1 (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI). +	 * Used for Internal Analog Modem. +	 */ +	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, CTS, RTS). +	 * Used for GPS or WiFi or Data stream. +	 */ +	at91_register_uart(AT91SAM9260_ID_US1, 2, +				ATMEL_UART_CTS | ATMEL_UART_RTS); +	/* +	 * USART2 on ttyS3 (Rx, Tx, CTS, RTS). +	 * Used for External Modem. +	 */ +	at91_register_uart(AT91SAM9260_ID_US2, 3, +				ATMEL_UART_CTS | ATMEL_UART_RTS); +	/* +	 * USART3 on ttyS4 (Rx, Tx, RTS). +	 * Used for RS-485. +	 */ +	at91_register_uart(AT91SAM9260_ID_US3, 4, ATMEL_UART_RTS); + +	/* +	 * USART4 on ttyS5 (Rx, Tx). +	 * Used for TRX433 Radio Module. +	 */ +	at91_register_uart(AT91SAM9260_ID_US4, 5, 0);  	stamp9g20_board_init();  	at91_add_device_usbh(&usbh_data);  	at91_add_device_udc(&udc_data);  |