Merge branch 'linux-2.6' into for-linus

5 files changed, 19 insertions, 19 deletions

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index b0d502622d94..0b71e7d18903 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -767,37 +767,37 @@ config SERIAL_CPM_SCC1
         bool "Support for SCC1 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SCC1 as a serial port
+          Select this option to use SCC1 as a serial port
 
 config SERIAL_CPM_SCC2
         bool "Support for SCC2 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SCC2 as a serial port
+          Select this option to use SCC2 as a serial port
 
 config SERIAL_CPM_SCC3
         bool "Support for SCC3 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SCC3 as a serial port
+          Select this option to use SCC3 as a serial port
 
 config SERIAL_CPM_SCC4
         bool "Support for SCC4 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SCC4 as a serial port
+          Select this option to use SCC4 as a serial port
 
 config SERIAL_CPM_SMC1
         bool "Support for SMC1 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SMC1 as a serial port
+          Select this option to use SMC1 as a serial port
 
 config SERIAL_CPM_SMC2
         bool "Support for SMC2 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SMC2 as a serial port
+          Select this option to use SMC2 as a serial port
 
 config SERIAL_SGI_L1_CONSOLE
         bool "SGI Altix L1 serial console support"
diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h
index a8f894c78194..69715e556506 100644
--- a/drivers/serial/cpm_uart/cpm_uart.h
+++ b/drivers/serial/cpm_uart/cpm_uart.h
@@ -88,7 +88,7 @@ extern struct uart_cpm_port cpm_uart_ports[UART_NR];
 
 /* these are located in their respective files */
 void cpm_line_cr_cmd(int line, int cmd);
-int cpm_uart_init_portdesc(void);
+int __init cpm_uart_init_portdesc(void);
 int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
 void cpm_uart_freebuf(struct uart_cpm_port *pinfo);
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 0abb544ae63d..7a3b97fdf8d1 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -195,10 +195,8 @@ static void cpm_uart_start_tx(struct uart_port *port)
         if (cpm_uart_tx_pump(port) != 0) {
                 if (IS_SMC(pinfo)) {
                         smcp->smc_smcm |= SMCM_TX;
-                        smcp->smc_smcmr |= SMCMR_TEN;
                 } else {
                         sccp->scc_sccm |= UART_SCCM_TX;
-                        pinfo->sccp->scc_gsmrl |= SCC_GSMRL_ENT;
                 }
         }
 }
@@ -421,9 +419,10 @@ static int cpm_uart_startup(struct uart_port *port)
         /* Startup rx-int */
         if (IS_SMC(pinfo)) {
                 pinfo->smcp->smc_smcm |= SMCM_RX;
-                pinfo->smcp->smc_smcmr |= SMCMR_REN;
+                pinfo->smcp->smc_smcmr |= (SMCMR_REN | SMCMR_TEN);
         } else {
                 pinfo->sccp->scc_sccm |= UART_SCCM_RX;
+                pinfo->sccp->scc_gsmrl |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
         }
 
         if (!(pinfo->flags & FLAG_CONSOLE))
@@ -1350,11 +1349,10 @@ static int cpm_uart_init(void) {
                 pr_info("cpm_uart: WARNING: no UART devices found on platform bus!\n");
                 pr_info(
                 "cpm_uart: the driver will guess configuration, but this mode is no longer supported.\n");
-#ifndef CONFIG_SERIAL_CPM_CONSOLE
-                ret = cpm_uart_init_portdesc();
-                if (ret)
-                        return ret;
-#endif
+
+                /* Don't run this again, if the console driver did it already */
+                if (cpm_uart_nr == 0)
+                        cpm_uart_init_portdesc();
 
                 cpm_reg.nr = cpm_uart_nr;
                 ret = uart_register_driver(&cpm_reg);
@@ -1366,6 +1364,8 @@ static int cpm_uart_init(void) {
                         int con = cpm_uart_port_map[i];
                         cpm_uart_ports[con].port.line = i;
                         cpm_uart_ports[con].port.flags = UPF_BOOT_AUTOCONF;
+                        if (cpm_uart_ports[con].set_lineif)
+                                cpm_uart_ports[con].set_lineif(&cpm_uart_ports[con]);
                         uart_add_one_port(&cpm_reg, &cpm_uart_ports[con].port);
                 }
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
index 95afc37297a8..08e55fdc882a 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -184,7 +184,7 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 }
 
 /* Setup any dynamic params in the uart desc */
-int cpm_uart_init_portdesc(void)
+int __init cpm_uart_init_portdesc(void)
 {
         pr_debug("CPM uart[-]:init portdesc\n");
 
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index 98ce88d80207..711bd1511439 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -921,7 +921,7 @@ static void handle_dma_error_intr(void *arg, uint32_t other_ir)
 {
         struct ioc4_port *port = (struct ioc4_port *)arg;
         struct hooks *hooks = port->ip_hooks;
-        unsigned int flags;
+        unsigned long flags;
 
         spin_lock_irqsave(&port->ip_lock, flags);
 
@@ -1834,7 +1834,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
         struct ioc4_port *port = (struct ioc4_port *)arg;
         struct hooks *hooks = port->ip_hooks;
         unsigned int rx_high_rd_aborted = 0;
-        unsigned int flags;
+        unsigned long flags;
         struct uart_port *the_port;
         int loop_counter;
 
@@ -2935,7 +2935,7 @@ static void __devexit ioc4_serial_exit(void)
         uart_unregister_driver(&ioc4_uart_rs422);
 }
 
-module_init(ioc4_serial_init);
+late_initcall(ioc4_serial_init); /* Call only after tty init is done */
 module_exit(ioc4_serial_exit);
 
 MODULE_AUTHOR("Pat Gefre - Silicon Graphics Inc. (SGI) <pfg@sgi.com>");