From b193a7b32adb2b20cfd7dca796c35d05cd2e31b7 Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 27 May 2009 16:22:01 +0000 Subject: [ar7] revert part of r16112, the setup.c part needs more testing git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16113 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar7/files/arch/mips/ar7/setup.c | 38 +--------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) (limited to 'target/linux/ar7/files/arch') diff --git a/target/linux/ar7/files/arch/mips/ar7/setup.c b/target/linux/ar7/files/arch/mips/ar7/setup.c index f54aedc2a..3448fd262 100644 --- a/target/linux/ar7/files/arch/mips/ar7/setup.c +++ b/target/linux/ar7/files/arch/mips/ar7/setup.c @@ -19,9 +19,6 @@ #include #include #include -#include -#include -#include #include #include @@ -72,40 +69,7 @@ const char *get_system_type(void) static int __init ar7_init_console(void) { - int res; - - static struct uart_port uart_port[2]; - - memset(uart_port, 0, sizeof(struct uart_port) * 2); - - uart_port[0].type = PORT_AR7; - uart_port[0].line = 0; - uart_port[0].irq = AR7_IRQ_UART0; - uart_port[0].uartclk = ar7_bus_freq() / 2; - uart_port[0].iotype = UPIO_MEM; - uart_port[0].mapbase = AR7_REGS_UART0; - uart_port[0].membase = ioremap(uart_port[0].mapbase, 256); - uart_port[0].regshift = 2; - res = early_serial_setup(&uart_port[0]); - if (res) - return res; - - /* Only TNETD73xx have a second serial port */ - if (ar7_has_second_uart()) { - uart_port[1].type = PORT_AR7; - uart_port[1].line = 1; - uart_port[1].irq = AR7_IRQ_UART1; - uart_port[1].uartclk = ar7_bus_freq() / 2; - uart_port[1].iotype = UPIO_MEM; - uart_port[1].mapbase = UR8_REGS_UART1; - uart_port[1].membase = ioremap(uart_port[1].mapbase, 256); - uart_port[1].regshift = 2; - res = early_serial_setup(&uart_port[1]); - if (res) - return res; - } - - return add_preferred_console("ttyS", 0, NULL); + return 0; } /* -- cgit v1.2.3