Changeset 16113


Ignore:
Timestamp:
2009-05-27T18:22:01+02:00 (9 years ago)
Author:
florian
Message:

[ar7] revert part of r16112, the setup.c part needs more testing

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar7/files/arch/mips/ar7/setup.c

    r16112 r16113  
    2020#include <linux/ioport.h> 
    2121#include <linux/pm.h> 
    22 #include <linux/console.h> 
    23 #include <linux/serial.h> 
    24 #include <linux/serial_8250.h> 
    2522 
    2623#include <asm/reboot.h> 
     
    7370static int __init ar7_init_console(void) 
    7471{ 
    75         int res; 
    76  
    77         static struct uart_port uart_port[2]; 
    78  
    79         memset(uart_port, 0, sizeof(struct uart_port) * 2); 
    80  
    81         uart_port[0].type = PORT_AR7; 
    82         uart_port[0].line = 0; 
    83         uart_port[0].irq = AR7_IRQ_UART0; 
    84         uart_port[0].uartclk = ar7_bus_freq() / 2; 
    85         uart_port[0].iotype = UPIO_MEM; 
    86         uart_port[0].mapbase = AR7_REGS_UART0; 
    87         uart_port[0].membase = ioremap(uart_port[0].mapbase, 256); 
    88         uart_port[0].regshift = 2; 
    89         res = early_serial_setup(&uart_port[0]); 
    90         if (res) 
    91                 return res; 
    92  
    93         /* Only TNETD73xx have a second serial port */ 
    94         if (ar7_has_second_uart()) { 
    95                 uart_port[1].type = PORT_AR7; 
    96                 uart_port[1].line = 1; 
    97                 uart_port[1].irq = AR7_IRQ_UART1; 
    98                 uart_port[1].uartclk = ar7_bus_freq() / 2; 
    99                 uart_port[1].iotype = UPIO_MEM; 
    100                 uart_port[1].mapbase = UR8_REGS_UART1; 
    101                 uart_port[1].membase = ioremap(uart_port[1].mapbase, 256); 
    102                 uart_port[1].regshift = 2; 
    103                 res = early_serial_setup(&uart_port[1]); 
    104                 if (res) 
    105                         return res; 
    106         } 
    107  
    108         return add_preferred_console("ttyS", 0, NULL); 
     72        return 0; 
    10973} 
    11074 
Note: See TracChangeset for help on using the changeset viewer.