Pull cpuidle into release branch

[pandora-kernel.git] / arch / mips / pmc-sierra / msp71xx / msp_serial.c

diff --git a/arch/mips/pmc-sierra/msp71xx/msp_serial.c b/arch/mips/pmc-sierra/msp71xx/msp_serial.c
index e25bac5..9de3430 100644 (file)
--- a/arch/mips/pmc-sierra/msp71xx/msp_serial.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_serial.c
@@ -117,12 +117,12 @@ void __init msp_serial_setup(void)
 
        /* Initialize first serial port */
        up.mapbase      = MSP_UART0_BASE;
-       up.membase      = ioremap_nocache(up.mapbase,MSP_UART_REG_LEN);
+       up.membase      = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
        up.irq          = MSP_INT_UART0;
        up.uartclk      = uartclk;
        up.regshift     = 2;
        up.iotype       = UPIO_DWAPB; /* UPIO_MEM like */
-       up.flags        = STD_COM_FLAGS;
+       up.flags        = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
        up.type         = PORT_16550A;
        up.line         = 0;
        up.private_data         = (void*)UART0_STATUS_REG;
@@ -145,9 +145,9 @@ void __init msp_serial_setup(void)
                        if( DEBUG_PORT_BASE == KSEG1ADDR(MSP_UART1_BASE) ) {
                                if( mips_machtype == MACH_MSP4200_FPGA
                                 || mips_machtype == MACH_MSP7120_FPGA )
-                                       initDebugPort(uartclk,19200);
+                                       initDebugPort(uartclk, 19200);
                                else
-                                       initDebugPort(uartclk,57600);
+                                       initDebugPort(uartclk, 57600);
                        }
 #endif
                        break;
@@ -157,7 +157,7 @@ void __init msp_serial_setup(void)
        }
 
        up.mapbase      = MSP_UART1_BASE;
-       up.membase      = ioremap_nocache(up.mapbase,MSP_UART_REG_LEN);
+       up.membase      = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
        up.irq          = MSP_INT_UART1;
        up.line         = 1;
        up.private_data         = (void*)UART1_STATUS_REG;