openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: at91: drop at91_set_serial_console 

at91_set_serial_console is used to define the default console of linux.
This is already manage by the cmdline. And if the boot loader can not be
modified you can still set it by enabling the CONFIG_CMDLINE_EXTEND option.
And then the command-line arguments provided by the boot loader will be
appended to the default kernel command string.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2012-04-05 13:43:40 +08:00 committed by Nicolas Ferre
parent 5f29d0a0ee
commit a27fa58117
46 changed files with 0 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-at91/at91rm9200.c
View File

@ -258,18 +258,6 @@ static void __init at91rm9200_register_clocks(void)
clk_register(&pck3); clk_register(&pck3);
} }
static struct clk_lookup console_clock_lookup;
void __init at91rm9200_set_console_clock(int id)
{
if (id >= ARRAY_SIZE(usart_clocks_lookups))
return;
console_clock_lookup.con_id = "usart";
console_clock_lookup.clk = usart_clocks_lookups[id].clk;
clkdev_add(&console_clock_lookup);
}
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* GPIO * GPIO
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */

12
arch/arm/mach-at91/at91rm9200_devices.c
View File

@ -1152,14 +1152,6 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
at91_uarts[portnr] = pdev; at91_uarts[portnr] = pdev;
} }
void __init at91_set_serial_console(unsigned portnr)
{
if (portnr < ATMEL_MAX_UART) {
atmel_default_console_device = at91_uarts[portnr];
at91rm9200_set_console_clock(at91_uarts[portnr]->id);
}
}
void __init at91_add_device_serial(void) void __init at91_add_device_serial(void)
{ {
int i; int i;
@ -1168,14 +1160,10 @@ void __init at91_add_device_serial(void)
if (at91_uarts[i]) if (at91_uarts[i])
platform_device_register(at91_uarts[i]); platform_device_register(at91_uarts[i]);
} }
if (!atmel_default_console_device)
printk(KERN_INFO "AT91: No default serial console defined.\n");
} }
#else #else
void __init __deprecated at91_init_serial(struct at91_uart_config *config) {} void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}
void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {} void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
void __init at91_set_serial_console(unsigned portnr) {}
void __init at91_add_device_serial(void) {} void __init at91_add_device_serial(void) {}
#endif #endif

12
arch/arm/mach-at91/at91sam9260.c
View File

@ -268,18 +268,6 @@ static void __init at91sam9260_register_clocks(void)
clk_register(&pck1); clk_register(&pck1);
} }
static struct clk_lookup console_clock_lookup;
void __init at91sam9260_set_console_clock(int id)
{
if (id >= ARRAY_SIZE(usart_clocks_lookups))
return;
console_clock_lookup.con_id = "usart";
console_clock_lookup.clk = usart_clocks_lookups[id].clk;
clkdev_add(&console_clock_lookup);
}
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* GPIO * GPIO
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */

12
arch/arm/mach-at91/at91sam9260_devices.c
View File

@ -1229,14 +1229,6 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
at91_uarts[portnr] = pdev; at91_uarts[portnr] = pdev;
} }
void __init at91_set_serial_console(unsigned portnr)
{
if (portnr < ATMEL_MAX_UART) {
atmel_default_console_device = at91_uarts[portnr];
at91sam9260_set_console_clock(at91_uarts[portnr]->id);
}
}
void __init at91_add_device_serial(void) void __init at91_add_device_serial(void)
{ {
int i; int i;
@ -1245,13 +1237,9 @@ void __init at91_add_device_serial(void)
if (at91_uarts[i]) if (at91_uarts[i])
platform_device_register(at91_uarts[i]); platform_device_register(at91_uarts[i]);
} }
if (!atmel_default_console_device)
printk(KERN_INFO "AT91: No default serial console defined.\n");
} }
#else #else
void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {} void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
void __init at91_set_serial_console(unsigned portnr) {}
void __init at91_add_device_serial(void) {} void __init at91_add_device_serial(void) {}
#endif #endif

12
arch/arm/mach-at91/at91sam9261.c
View File

@ -239,18 +239,6 @@ static void __init at91sam9261_register_clocks(void)
clk_register(&hck1); clk_register(&hck1);
} }
static struct clk_lookup console_clock_lookup;
void __init at91sam9261_set_console_clock(int id)
{
if (id >= ARRAY_SIZE(usart_clocks_lookups))
return;
console_clock_lookup.con_id = "usart";
console_clock_lookup.clk = usart_clocks_lookups[id].clk;
clkdev_add(&console_clock_lookup);
}
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* GPIO * GPIO
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */

12
arch/arm/mach-at91/at91sam9261_devices.c
View File

@ -1051,14 +1051,6 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
at91_uarts[portnr] = pdev; at91_uarts[portnr] = pdev;
} }
void __init at91_set_serial_console(unsigned portnr)
{
if (portnr < ATMEL_MAX_UART) {
atmel_default_console_device = at91_uarts[portnr];
at91sam9261_set_console_clock(at91_uarts[portnr]->id);
}
}
void __init at91_add_device_serial(void) void __init at91_add_device_serial(void)
{ {
int i; int i;
@ -1067,13 +1059,9 @@ void __init at91_add_device_serial(void)
if (at91_uarts[i]) if (at91_uarts[i])
platform_device_register(at91_uarts[i]); platform_device_register(at91_uarts[i]);
} }
if (!atmel_default_console_device)
printk(KERN_INFO "AT91: No default serial console defined.\n");
} }
#else #else
void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {} void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
void __init at91_set_serial_console(unsigned portnr) {}
void __init at91_add_device_serial(void) {} void __init at91_add_device_serial(void) {}
#endif #endif

12
arch/arm/mach-at91/at91sam9263.c
View File

@ -255,18 +255,6 @@ static void __init at91sam9263_register_clocks(void)
clk_register(&pck3); clk_register(&pck3);
} }
static struct clk_lookup console_clock_lookup;
void __init at91sam9263_set_console_clock(int id)
{
if (id >= ARRAY_SIZE(usart_clocks_lookups))
return;
console_clock_lookup.con_id = "usart";
console_clock_lookup.clk = usart_clocks_lookups[id].clk;
clkdev_add(&console_clock_lookup);
}
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* GPIO * GPIO
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */

12
arch/arm/mach-at91/at91sam9263_devices.c
View File

@ -1461,14 +1461,6 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
at91_uarts[portnr] = pdev; at91_uarts[portnr] = pdev;
} }
void __init at91_set_serial_console(unsigned portnr)
{
if (portnr < ATMEL_MAX_UART) {
atmel_default_console_device = at91_uarts[portnr];
at91sam9263_set_console_clock(at91_uarts[portnr]->id);
}
}
void __init at91_add_device_serial(void) void __init at91_add_device_serial(void)
{ {
int i; int i;
@ -1477,13 +1469,9 @@ void __init at91_add_device_serial(void)
if (at91_uarts[i]) if (at91_uarts[i])
platform_device_register(at91_uarts[i]); platform_device_register(at91_uarts[i]);
} }
if (!atmel_default_console_device)
printk(KERN_INFO "AT91: No default serial console defined.\n");
} }
#else #else
void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {} void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
void __init at91_set_serial_console(unsigned portnr) {}
void __init at91_add_device_serial(void) {} void __init at91_add_device_serial(void) {}
#endif #endif

12
arch/arm/mach-at91/at91sam9g45.c
View File

@ -288,18 +288,6 @@ static void __init at91sam9g45_register_clocks(void)
clk_register(&pck1); clk_register(&pck1);
} }
static struct clk_lookup console_clock_lookup;
void __init at91sam9g45_set_console_clock(int id)
{
if (id >= ARRAY_SIZE(usart_clocks_lookups))
return;
console_clock_lookup.con_id = "usart";
console_clock_lookup.clk = usart_clocks_lookups[id].clk;
clkdev_add(&console_clock_lookup);
}
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* GPIO * GPIO
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */

12
arch/arm/mach-at91/at91sam9g45_devices.c
View File

@ -1741,14 +1741,6 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
at91_uarts[portnr] = pdev; at91_uarts[portnr] = pdev;
} }
void __init at91_set_serial_console(unsigned portnr)
{
if (portnr < ATMEL_MAX_UART) {
atmel_default_console_device = at91_uarts[portnr];
at91sam9g45_set_console_clock(at91_uarts[portnr]->id);
}
}
void __init at91_add_device_serial(void) void __init at91_add_device_serial(void)
{ {
int i; int i;
@ -1757,13 +1749,9 @@ void __init at91_add_device_serial(void)
if (at91_uarts[i]) if (at91_uarts[i])
platform_device_register(at91_uarts[i]); platform_device_register(at91_uarts[i]);
} }
if (!atmel_default_console_device)
printk(KERN_INFO "AT91: No default serial console defined.\n");
} }
#else #else
void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {} void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
void __init at91_set_serial_console(unsigned portnr) {}
void __init at91_add_device_serial(void) {} void __init at91_add_device_serial(void) {}
#endif #endif

12
arch/arm/mach-at91/at91sam9rl.c
View File

@ -232,18 +232,6 @@ static void __init at91sam9rl_register_clocks(void)
clk_register(&pck1); clk_register(&pck1);
} }
static struct clk_lookup console_clock_lookup;
void __init at91sam9rl_set_console_clock(int id)
{
if (id >= ARRAY_SIZE(usart_clocks_lookups))
return;
console_clock_lookup.con_id = "usart";
console_clock_lookup.clk = usart_clocks_lookups[id].clk;
clkdev_add(&console_clock_lookup);
}
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* GPIO * GPIO
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */

12
arch/arm/mach-at91/at91sam9rl_devices.c
View File

@ -1192,14 +1192,6 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
at91_uarts[portnr] = pdev; at91_uarts[portnr] = pdev;
} }
void __init at91_set_serial_console(unsigned portnr)
{
if (portnr < ATMEL_MAX_UART) {
atmel_default_console_device = at91_uarts[portnr];
at91sam9rl_set_console_clock(at91_uarts[portnr]->id);
}
}
void __init at91_add_device_serial(void) void __init at91_add_device_serial(void)
{ {
int i; int i;
@ -1208,13 +1200,9 @@ void __init at91_add_device_serial(void)
if (at91_uarts[i]) if (at91_uarts[i])
platform_device_register(at91_uarts[i]); platform_device_register(at91_uarts[i]);
} }
if (!atmel_default_console_device)
printk(KERN_INFO "AT91: No default serial console defined.\n");
} }
#else #else
void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {} void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
void __init at91_set_serial_console(unsigned portnr) {}
void __init at91_add_device_serial(void) {} void __init at91_add_device_serial(void) {}
#endif #endif

3
arch/arm/mach-at91/board-1arm.c
View File

@ -58,9 +58,6 @@ static void __init onearm_init_early(void)
at91_register_uart(AT91RM9200_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS at91_register_uart(AT91RM9200_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS
| ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
| ATMEL_UART_RI); | ATMEL_UART_RI);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata onearm_eth_data = { static struct macb_platform_data __initdata onearm_eth_data = {

3
arch/arm/mach-at91/board-afeb-9260v1.c
View File

@ -65,9 +65,6 @@ static void __init afeb9260_init_early(void)
/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
at91_register_uart(AT91SAM9260_ID_US1, 2, at91_register_uart(AT91SAM9260_ID_US1, 2,
ATMEL_UART_CTS | ATMEL_UART_RTS); ATMEL_UART_CTS | ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-cam60.c
View File

@ -52,9 +52,6 @@ static void __init cam60_init_early(void)
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-carmeva.c
View File

@ -52,9 +52,6 @@ static void __init carmeva_init_early(void)
at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
| ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
| ATMEL_UART_RI); | ATMEL_UART_RI);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata carmeva_eth_data = { static struct macb_platform_data __initdata carmeva_eth_data = {

3
arch/arm/mach-at91/board-cpu9krea.c
View File

@ -77,9 +77,6 @@ static void __init cpu9krea_init_early(void)
/* USART5 on ttyS6. (Rx, Tx) */ /* USART5 on ttyS6. (Rx, Tx) */
at91_register_uart(AT91SAM9260_ID_US5, 6, 0); at91_register_uart(AT91SAM9260_ID_US5, 6, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-cpuat91.c
View File

@ -78,9 +78,6 @@ static void __init cpuat91_init_early(void)
/* USART3 on ttyS4 (Rx, Tx, CTS, RTS) */ /* USART3 on ttyS4 (Rx, Tx, CTS, RTS) */
at91_register_uart(AT91RM9200_ID_US3, 4, ATMEL_UART_CTS | at91_register_uart(AT91RM9200_ID_US3, 4, ATMEL_UART_CTS |
ATMEL_UART_RTS); ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata cpuat91_eth_data = { static struct macb_platform_data __initdata cpuat91_eth_data = {

3
arch/arm/mach-at91/board-csb337.c
View File

@ -53,9 +53,6 @@ static void __init csb337_init_early(void)
/* DBGU on ttyS0 */ /* DBGU on ttyS0 */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
/* make console=ttyS0 the default */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata csb337_eth_data = { static struct macb_platform_data __initdata csb337_eth_data = {

3
arch/arm/mach-at91/board-csb637.c
View File

@ -47,9 +47,6 @@ static void __init csb637_init_early(void)
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
/* make console=ttyS0 (ie, DBGU) the default */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata csb637_eth_data = { static struct macb_platform_data __initdata csb637_eth_data = {

3
arch/arm/mach-at91/board-eb9200.c
View File

@ -55,9 +55,6 @@ static void __init eb9200_init_early(void)
/* USART2 on ttyS2. (Rx, Tx) - IRDA */ /* USART2 on ttyS2. (Rx, Tx) - IRDA */
at91_register_uart(AT91RM9200_ID_US2, 2, 0); at91_register_uart(AT91RM9200_ID_US2, 2, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata eb9200_eth_data = { static struct macb_platform_data __initdata eb9200_eth_data = {

3
arch/arm/mach-at91/board-ecbat91.c
View File

@ -59,9 +59,6 @@ static void __init ecb_at91init_early(void)
/* USART0 on ttyS1. (Rx & Tx only) */ /* USART0 on ttyS1. (Rx & Tx only) */
at91_register_uart(AT91RM9200_ID_US0, 1, 0); at91_register_uart(AT91RM9200_ID_US0, 1, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata ecb_at91eth_data = { static struct macb_platform_data __initdata ecb_at91eth_data = {

3
arch/arm/mach-at91/board-eco920.c
View File

@ -43,9 +43,6 @@ static void __init eco920_init_early(void)
/* DBGU on ttyS0. (Rx & Tx only */ /* DBGU on ttyS0. (Rx & Tx only */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata eco920_eth_data = { static struct macb_platform_data __initdata eco920_eth_data = {

3
arch/arm/mach-at91/board-flexibity.c
View File

@ -44,9 +44,6 @@ static void __init flexibity_init_early(void)
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* USB Host port */ /* USB Host port */

3
arch/arm/mach-at91/board-foxg20.c
View File

@ -93,9 +93,6 @@ static void __init foxg20_init_early(void)
/* USART5 on ttyS6. (Rx & Tx only) */ /* USART5 on ttyS6. (Rx & Tx only) */
at91_register_uart(AT91SAM9260_ID_US5, 6, 0); 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 */ /* Set the internal pull-up resistor on DRXD */
at91_set_A_periph(AT91_PIN_PB14, 1); at91_set_A_periph(AT91_PIN_PB14, 1);

3
arch/arm/mach-at91/board-kafa.c
View File

@ -56,9 +56,6 @@ static void __init kafa_init_early(void)
/* USART0 on ttyS1 (Rx, Tx, CTS, RTS) */ /* USART0 on ttyS1 (Rx, Tx, CTS, RTS) */
at91_register_uart(AT91RM9200_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS); at91_register_uart(AT91RM9200_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata kafa_eth_data = { static struct macb_platform_data __initdata kafa_eth_data = {

3
arch/arm/mach-at91/board-kb9202.c
View File

@ -65,9 +65,6 @@ static void __init kb9202_init_early(void)
/* USART3 on ttyS3 (Rx, Tx, CTS, RTS) - RS485 (optional) */ /* USART3 on ttyS3 (Rx, Tx, CTS, RTS) - RS485 (optional) */
at91_register_uart(AT91RM9200_ID_US3, 3, ATMEL_UART_CTS | ATMEL_UART_RTS); at91_register_uart(AT91RM9200_ID_US3, 3, ATMEL_UART_CTS | ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata kb9202_eth_data = { static struct macb_platform_data __initdata kb9202_eth_data = {

3
arch/arm/mach-at91/board-neocore926.c
View File

@ -61,9 +61,6 @@ static void __init neocore926_init_early(void)
/* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */ /* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */
at91_register_uart(AT91SAM9263_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS); at91_register_uart(AT91SAM9263_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-picotux200.c
View File

@ -56,9 +56,6 @@ static void __init picotux200_init_early(void)
at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
| ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
| ATMEL_UART_RI); | ATMEL_UART_RI);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata picotux200_eth_data = { static struct macb_platform_data __initdata picotux200_eth_data = {

4
arch/arm/mach-at91/board-qil-a9260.c
View File

@ -66,10 +66,6 @@ static void __init ek_init_early(void)
/* USART2 on ttyS3. (Rx, Tx, CTS, RTS) */ /* USART2 on ttyS3. (Rx, Tx, CTS, RTS) */
at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_CTS | ATMEL_UART_RTS); at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_CTS | ATMEL_UART_RTS);
/* set serial console to ttyS1 (ie, USART0) */
at91_set_serial_console(1);
} }
/* /*

3
arch/arm/mach-at91/board-rm9200dk.c
View File

@ -61,9 +61,6 @@ static void __init dk_init_early(void)
at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
| ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
| ATMEL_UART_RI); | ATMEL_UART_RI);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata dk_eth_data = { static struct macb_platform_data __initdata dk_eth_data = {

3
arch/arm/mach-at91/board-rm9200ek.c
View File

@ -61,9 +61,6 @@ static void __init ek_init_early(void)
at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
| ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
| ATMEL_UART_RI); | ATMEL_UART_RI);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static struct macb_platform_data __initdata ek_eth_data = { static struct macb_platform_data __initdata ek_eth_data = {

3
arch/arm/mach-at91/board-rsi-ews.c
View File

@ -52,9 +52,6 @@ static void __init rsi_ews_init_early(void)
/* USART3 on ttyS4. (Rx, Tx, RTS) */ /* USART3 on ttyS4. (Rx, Tx, RTS) */
/* RS485 communication */ /* RS485 communication */
at91_register_uart(AT91RM9200_ID_US3, 4, ATMEL_UART_RTS); at91_register_uart(AT91RM9200_ID_US3, 4, ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-sam9-l9260.c
View File

@ -62,9 +62,6 @@ static void __init ek_init_early(void)
/* USART1 on ttyS2. (Rx, Tx, CTS, RTS) */ /* USART1 on ttyS2. (Rx, Tx, CTS, RTS) */
at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS); at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-sam9260ek.c
View File

@ -65,9 +65,6 @@ static void __init ek_init_early(void)
/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS); at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-sam9261ek.c
View File

@ -64,9 +64,6 @@ static void __init ek_init_early(void)
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-sam9263ek.c
View File

@ -63,9 +63,6 @@ static void __init ek_init_early(void)
/* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */ /* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */
at91_register_uart(AT91SAM9263_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS); at91_register_uart(AT91SAM9263_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-sam9g20ek.c
View File

@ -76,9 +76,6 @@ static void __init ek_init_early(void)
/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS); at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-sam9m10g45ek.c
View File

@ -60,9 +60,6 @@ static void __init ek_init_early(void)
/* USART0 not connected on the -EK board */ /* USART0 not connected on the -EK board */
/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
at91_register_uart(AT91SAM9G45_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS); at91_register_uart(AT91SAM9G45_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-sam9rlek.c
View File

@ -48,9 +48,6 @@ static void __init ek_init_early(void)
/* USART0 on ttyS1. (Rx, Tx, CTS, RTS) */ /* USART0 on ttyS1. (Rx, Tx, CTS, RTS) */
at91_register_uart(AT91SAM9RL_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS); at91_register_uart(AT91SAM9RL_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

1
arch/arm/mach-at91/board-snapper9260.c
View File

@ -46,7 +46,6 @@ static void __init snapper9260_init_early(void)
/* Debug on ttyS0 */ /* Debug on ttyS0 */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
at91_set_serial_console(0);
at91_register_uart(AT91SAM9260_ID_US0, 1, at91_register_uart(AT91SAM9260_ID_US0, 1,
ATMEL_UART_CTS | ATMEL_UART_RTS); ATMEL_UART_CTS | ATMEL_UART_RTS);

3
arch/arm/mach-at91/board-stamp9g20.c
View File

@ -39,9 +39,6 @@ void __init stamp9g20_init_early(void)
/* DGBU on ttyS0. (Rx & Tx only) */ /* DGBU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static void __init stamp9g20evb_init_early(void) static void __init stamp9g20evb_init_early(void)

3
arch/arm/mach-at91/board-usb-a926x.c
View File

@ -56,9 +56,6 @@ static void __init ek_init_early(void)
/* DBGU on ttyS0. (Rx & Tx only) */ /* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

3
arch/arm/mach-at91/board-yl-9200.c
View File

@ -75,9 +75,6 @@ static void __init yl9200_init_early(void)
/* USART3 on ttyS3. (Rx, Tx, RTS - RS485 interface) */ /* USART3 on ttyS3. (Rx, Tx, RTS - RS485 interface) */
at91_register_uart(AT91RM9200_ID_US3, 3, ATMEL_UART_RTS); at91_register_uart(AT91RM9200_ID_US3, 3, ATMEL_UART_RTS);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
/* /*

11
arch/arm/mach-at91/generic.h
View File

@ -40,17 +40,6 @@ extern struct sys_timer at91sam926x_timer;
extern struct sys_timer at91x40_timer; extern struct sys_timer at91x40_timer;
/* Clocks */ /* Clocks */
/*
* function to specify the clock of the default console. As we do not
* use the device/driver bus, the dev_name is not intialize. So we need
* to link the clock to a specific con_id only "usart"
*/
extern void __init at91rm9200_set_console_clock(int id);
extern void __init at91sam9260_set_console_clock(int id);
extern void __init at91sam9261_set_console_clock(int id);
extern void __init at91sam9263_set_console_clock(int id);
extern void __init at91sam9rl_set_console_clock(int id);
extern void __init at91sam9g45_set_console_clock(int id);
#ifdef CONFIG_AT91_PMC_UNIT #ifdef CONFIG_AT91_PMC_UNIT
extern int __init at91_clock_init(unsigned long main_clock); extern int __init at91_clock_init(unsigned long main_clock);
extern int __init at91_dt_clock_init(void); extern int __init at91_dt_clock_init(void);

1
arch/arm/mach-at91/include/mach/board.h
View File

@ -121,7 +121,6 @@ extern void __init at91_add_device_spi(struct spi_board_info *devices, int nr_de
#define ATMEL_UART_RI 0x20 #define ATMEL_UART_RI 0x20
extern void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins); extern void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins);
extern void __init at91_set_serial_console(unsigned portnr);
extern struct platform_device *atmel_default_console_device; extern struct platform_device *atmel_default_console_device;