Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19750336 authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 5059/1: [AT91] Convert to new-style UART initialization 



Convert the following AT91RM9200-based boards to the new-style UART
initialization:
  - Conitec ARM&EVA
  - Atmel AT91RM9200-DK
  - Embest ATEB9200
  - Atmel AT91RM9200-EK
  - KwikByte KB920x

Signed-off-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7b225341

arch/arm/mach-at91/board-carmeva.c

+10 −13
Original line number Diff line number Diff line
@@ -40,24 +40,21 @@ 
#include "generic.h"





/*

 * Serial port configuration.

 *    0 .. 3 = USART0 .. USART3

 *    4      = DBGU

 */

static struct at91_uart_config __initdata carmeva_uart_config = {

	.console_tty	= 0,				/* ttyS0 */

	.nr_tty		= 2,

	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */

};



static void __init carmeva_map_io(void)

{

	/* Initialize processor: 20.000 MHz crystal */

	at91rm9200_initialize(20000000, AT91RM9200_BGA);



	/* Setup the serial ports and console */

	at91_init_serial(&carmeva_uart_config);

	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS

			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD

			   | ATMEL_UART_RI);



	/* set serial console to ttyS0 (ie, DBGU) */

	at91_set_serial_console(0);

}



static void __init carmeva_init_irq(void)

arch/arm/mach-at91/board-csb637.c

+2 −2
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ static void __init csb637_map_io(void) 
	/* Initialize processor: 3.6864 MHz crystal */

	at91rm9200_initialize(3686400, AT91RM9200_BGA);



	/* DBGU on ttyS0 */

	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* make console=ttyS0 the default */

	/* make console=ttyS0 (ie, DBGU) the default */

	at91_set_serial_console(0);

}

arch/arm/mach-at91/board-dk.c

+11 −14
Original line number Diff line number Diff line
@@ -45,17 +45,6 @@ 
#include "generic.h"





/*

 * Serial port configuration.

 *    0 .. 3 = USART0 .. USART3

 *    4      = DBGU

 */

static struct at91_uart_config __initdata dk_uart_config = {

	.console_tty	= 0,				/* ttyS0 */

	.nr_tty		= 2,

	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */

};



static void __init dk_map_io(void)

{

	/* Initialize processor: 18.432 MHz crystal */
@@ -64,8 +53,16 @@ static void __init dk_map_io(void) 
	/* Setup the LEDs */

	at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);



	/* Setup the serial ports and console */

	at91_init_serial(&dk_uart_config);

	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS

			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD

			   | ATMEL_UART_RI);



	/* set serial console to ttyS0 (ie, DBGU) */

	at91_set_serial_console(0);

}



static void __init dk_init_irq(void)

arch/arm/mach-at91/board-eb9200.c

+13 −13
Original line number Diff line number Diff line
@@ -40,24 +40,24 @@ 
#include "generic.h"





/*

 * Serial port configuration.

 *    0 .. 3 = USART0 .. USART3

 *    4      = DBGU

 */

static struct at91_uart_config __initdata eb9200_uart_config = {

	.console_tty	= 0,				/* ttyS0 */

	.nr_tty		= 2,

	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */

};



static void __init eb9200_map_io(void)

{

	/* Initialize processor: 18.432 MHz crystal */

	at91rm9200_initialize(18432000, AT91RM9200_BGA);



	/* Setup the serial ports and console */

	at91_init_serial(&eb9200_uart_config);

	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS

			| ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD

			| ATMEL_UART_RI);



	/* USART2 on ttyS2. (Rx, Tx) - IRDA */

	at91_register_uart(AT91RM9200_ID_US2, 2, 0);



	/* set serial console to ttyS0 (ie, DBGU) */

	at91_set_serial_console(0);

}



static void __init eb9200_init_irq(void)

arch/arm/mach-at91/board-ek.c

+11 −14
Original line number Diff line number Diff line
@@ -45,17 +45,6 @@ 
#include "generic.h"





/*

 * Serial port configuration.

 *    0 .. 3 = USART0 .. USART3

 *    4      = DBGU

 */

static struct at91_uart_config __initdata ek_uart_config = {

	.console_tty	= 0,				/* ttyS0 */

	.nr_tty		= 2,

	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */

};



static void __init ek_map_io(void)

{

	/* Initialize processor: 18.432 MHz crystal */
@@ -64,8 +53,16 @@ static void __init ek_map_io(void) 
	/* Setup the LEDs */

	at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2);



	/* Setup the serial ports and console */

	at91_init_serial(&ek_uart_config);

	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS

			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD

			   | ATMEL_UART_RI);



	/* set serial console to ttyS0 (ie, DBGU) */

	at91_set_serial_console(0);

}



static void __init ek_init_irq(void)