7 files changed, 82 insertions, 55 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 5261f0af8b10..2964ca9df5a0 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -920,12 +920,16 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
 #ifdef __i386__
                 outb(0xff, 0x080);
 #endif
-                scratch2 = serial_inp(up, UART_IER);
+                /*
+                 * Mask out IER[7:4] bits for test as some UARTs (e.g. TL
+                 * 16C754B) allow only to modify them if an EFR bit is set.
+                 */
+                scratch2 = serial_inp(up, UART_IER) & 0x0f;
                 serial_outp(up, UART_IER, 0x0F);
 #ifdef __i386__
                 outb(0, 0x080);
 #endif
-                scratch3 = serial_inp(up, UART_IER);
+                scratch3 = serial_inp(up, UART_IER) & 0x0f;
                 serial_outp(up, UART_IER, scratch);
                 if (scratch2 != 0 || scratch3 != 0x0F) {
                         /*
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 52e2e64c6649..a2dac378bda9 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -679,6 +679,13 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
          */
         {
                 .vendor         = PCI_VENDOR_ID_PLX,
+                .device         = PCI_DEVICE_ID_PLX_9030,
+                .subvendor      = PCI_SUBVENDOR_ID_PERLE,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_PLX,
                 .device         = PCI_DEVICE_ID_PLX_9050,
                 .subvendor      = PCI_SUBVENDOR_ID_EXSYS,
                 .subdevice      = PCI_SUBDEVICE_ID_EXSYS_4055,
@@ -936,6 +943,7 @@ enum pci_board_num_t {
 
         pbn_b2_1_115200,
         pbn_b2_2_115200,
+        pbn_b2_4_115200,
         pbn_b2_8_115200,
 
         pbn_b2_1_460800,
@@ -1249,6 +1257,12 @@ static struct pciserial_board pci_boards[] __devinitdata = {
                 .base_baud      = 115200,
                 .uart_offset    = 8,
         },
+        [pbn_b2_4_115200] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 4,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
         [pbn_b2_8_115200] = {
                 .flags          = FL_BASE2,
                 .num_ports      = 8,
@@ -1990,6 +2004,10 @@ static struct pci_device_id serial_pci_tbl[] = {
         {       PCI_VENDOR_ID_PANACOM, PCI_DEVICE_ID_PANACOM_DUALMODEM,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                 pbn_panacom2 },
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030,
+                PCI_VENDOR_ID_ESDGMBH,
+                PCI_DEVICE_ID_ESDGMBH_CPCIASIO4, 0, 0,
+                pbn_b2_4_115200 },
         {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
                 PCI_SUBVENDOR_ID_CHASE_PCIFAST,
                 PCI_SUBDEVICE_ID_CHASE_PCIFAST4, 0, 0, 
@@ -2379,6 +2397,15 @@ static struct pci_device_id serial_pci_tbl[] = {
                 pbn_b2_2_115200 },
 
         /*
+         * Perle PCI-RAS cards
+         */
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030,
+                PCI_SUBVENDOR_ID_PERLE, PCI_SUBDEVICE_ID_PCI_RAS4,
+                0, 0, pbn_b2_4_921600 },
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030,
+                PCI_SUBVENDOR_ID_PERLE, PCI_SUBDEVICE_ID_PCI_RAS8,
+                0, 0, pbn_b2_8_921600 },
+        /*
          * These entries match devices with class COMMUNICATION_SERIAL,
          * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
          */
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 2978c09860ee..5cc6b91f8408 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -916,6 +916,11 @@ config SERIAL_TXX9
 config HAS_TXX9_SERIAL
         bool
 
+config SERIAL_TXX9_NR_UARTS
+        int "Maximum number of TMPTX39XX/49XX SIO ports"
+        depends on SERIAL_TXX9
+        default "6"
+
 config SERIAL_TXX9_CONSOLE
         bool "TMPTX39XX/49XX SIO Console support"
         depends on SERIAL_TXX9=y
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 881f886b91c6..df45a7ac773f 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -73,35 +73,35 @@
 
 #define ATMEL_ISR_PASS_LIMIT    256
 
-#define UART_PUT_CR(port,v)     writel(v, (port)->membase + ATMEL_US_CR)
-#define UART_GET_MR(port)       readl((port)->membase + ATMEL_US_MR)
-#define UART_PUT_MR(port,v)     writel(v, (port)->membase + ATMEL_US_MR)
-#define UART_PUT_IER(port,v)    writel(v, (port)->membase + ATMEL_US_IER)
-#define UART_PUT_IDR(port,v)    writel(v, (port)->membase + ATMEL_US_IDR)
-#define UART_GET_IMR(port)      readl((port)->membase + ATMEL_US_IMR)
-#define UART_GET_CSR(port)      readl((port)->membase + ATMEL_US_CSR)
-#define UART_GET_CHAR(port)     readl((port)->membase + ATMEL_US_RHR)
-#define UART_PUT_CHAR(port,v)   writel(v, (port)->membase + ATMEL_US_THR)
-#define UART_GET_BRGR(port)     readl((port)->membase + ATMEL_US_BRGR)
-#define UART_PUT_BRGR(port,v)   writel(v, (port)->membase + ATMEL_US_BRGR)
-#define UART_PUT_RTOR(port,v)   writel(v, (port)->membase + ATMEL_US_RTOR)
-
-// #define UART_GET_CR(port)    readl((port)->membase + ATMEL_US_CR)            // is write-only
+#define UART_PUT_CR(port,v)     __raw_writel(v, (port)->membase + ATMEL_US_CR)
+#define UART_GET_MR(port)       __raw_readl((port)->membase + ATMEL_US_MR)
+#define UART_PUT_MR(port,v)     __raw_writel(v, (port)->membase + ATMEL_US_MR)
+#define UART_PUT_IER(port,v)    __raw_writel(v, (port)->membase + ATMEL_US_IER)
+#define UART_PUT_IDR(port,v)    __raw_writel(v, (port)->membase + ATMEL_US_IDR)
+#define UART_GET_IMR(port)      __raw_readl((port)->membase + ATMEL_US_IMR)
+#define UART_GET_CSR(port)      __raw_readl((port)->membase + ATMEL_US_CSR)
+#define UART_GET_CHAR(port)     __raw_readl((port)->membase + ATMEL_US_RHR)
+#define UART_PUT_CHAR(port,v)   __raw_writel(v, (port)->membase + ATMEL_US_THR)
+#define UART_GET_BRGR(port)     __raw_readl((port)->membase + ATMEL_US_BRGR)
+#define UART_PUT_BRGR(port,v)   __raw_writel(v, (port)->membase + ATMEL_US_BRGR)
+#define UART_PUT_RTOR(port,v)   __raw_writel(v, (port)->membase + ATMEL_US_RTOR)
+
+// #define UART_GET_CR(port)    __raw_readl((port)->membase + ATMEL_US_CR)              // is write-only
 
  /* PDC registers */
-#define UART_PUT_PTCR(port,v)   writel(v, (port)->membase + ATMEL_PDC_PTCR)
-#define UART_GET_PTSR(port)     readl((port)->membase + ATMEL_PDC_PTSR)
-
-#define UART_PUT_RPR(port,v)    writel(v, (port)->membase + ATMEL_PDC_RPR)
-#define UART_GET_RPR(port)      readl((port)->membase + ATMEL_PDC_RPR)
-#define UART_PUT_RCR(port,v)    writel(v, (port)->membase + ATMEL_PDC_RCR)
-#define UART_PUT_RNPR(port,v)   writel(v, (port)->membase + ATMEL_PDC_RNPR)
-#define UART_PUT_RNCR(port,v)   writel(v, (port)->membase + ATMEL_PDC_RNCR)
-
-#define UART_PUT_TPR(port,v)    writel(v, (port)->membase + ATMEL_PDC_TPR)
-#define UART_PUT_TCR(port,v)    writel(v, (port)->membase + ATMEL_PDC_TCR)
-//#define UART_PUT_TNPR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNPR)
-//#define UART_PUT_TNCR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNCR)
+#define UART_PUT_PTCR(port,v)   __raw_writel(v, (port)->membase + ATMEL_PDC_PTCR)
+#define UART_GET_PTSR(port)     __raw_readl((port)->membase + ATMEL_PDC_PTSR)
+
+#define UART_PUT_RPR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_RPR)
+#define UART_GET_RPR(port)      __raw_readl((port)->membase + ATMEL_PDC_RPR)
+#define UART_PUT_RCR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_RCR)
+#define UART_PUT_RNPR(port,v)   __raw_writel(v, (port)->membase + ATMEL_PDC_RNPR)
+#define UART_PUT_RNCR(port,v)   __raw_writel(v, (port)->membase + ATMEL_PDC_RNCR)
+
+#define UART_PUT_TPR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_TPR)
+#define UART_PUT_TCR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_TCR)
+//#define UART_PUT_TNPR(port,v) __raw_writel(v, (port)->membase + ATMEL_PDC_TNPR)
+//#define UART_PUT_TNCR(port,v) __raw_writel(v, (port)->membase + ATMEL_PDC_TNCR)
 
 static int (*atmel_open_hook)(struct uart_port *);
 static void (*atmel_close_hook)(struct uart_port *);
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 42b050c46abe..312bef6bd583 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -3173,12 +3173,8 @@ do_softint(void *private_)
         if (!tty)
                 return;
 
-        if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {
-                if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
-                    tty->ldisc.write_wakeup)
-                        (tty->ldisc.write_wakeup)(tty);
-                wake_up_interruptible(&tty->write_wait);
-        }
+        if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event))
+                tty_wakeup(tty);
 }
 
 static int
@@ -3798,11 +3794,7 @@ rs_flush_buffer(struct tty_struct *tty)
         info->xmit.head = info->xmit.tail = 0;
         restore_flags(flags);
 
-        wake_up_interruptible(&tty->write_wait);
-
-        if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
-            tty->ldisc.write_wakeup)
-                (tty->ldisc.write_wakeup)(tty);
+        tty_wakeup(tty);
 }
 
 /*
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index c862f67c985a..f540212e7409 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -2685,7 +2685,7 @@ static int ioc4_serial_remove_one(struct ioc4_driver_data *idd)
                 free_irq(control->ic_irq, soft);
                 if (soft->is_ioc4_serial_addr) {
                         iounmap(soft->is_ioc4_serial_addr);
-                        release_region((unsigned long)
+                        release_mem_region((unsigned long)
                              soft->is_ioc4_serial_addr,
                                 sizeof(struct ioc4_serial));
                 }
@@ -2790,7 +2790,7 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)
         /* request serial registers */
         tmp_addr1 = idd->idd_bar0 + IOC4_SERIAL_OFFSET;
 
-        if (!request_region(tmp_addr1, sizeof(struct ioc4_serial),
+        if (!request_mem_region(tmp_addr1, sizeof(struct ioc4_serial),
                                         "sioc4_uart")) {
                 printk(KERN_WARNING
                         "ioc4 (%p): unable to get request region for "
@@ -2889,7 +2889,7 @@ out3:
 out2:
         if (serial)
                 iounmap(serial);
-        release_region(tmp_addr1, sizeof(struct ioc4_serial));
+        release_mem_region(tmp_addr1, sizeof(struct ioc4_serial));
 out1:
 
         return ret;
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index 7186a82c4759..f4440d329310 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -37,6 +37,7 @@
  *      1.06    Do not insert a char caused previous overrun.
  *              Fix some spin_locks.
  *              Do not call uart_add_one_port for absent ports.
+ *      1.07    Use CONFIG_SERIAL_TXX9_NR_UARTS.  Cleanup.
  */
 
 #if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -58,9 +59,8 @@
 #include <linux/mutex.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 
-static char *serial_version = "1.06";
+static char *serial_version = "1.07";
 static char *serial_name = "TX39/49 Serial driver";
 
 #define PASS_LIMIT      256
@@ -88,12 +88,7 @@ static char *serial_name = "TX39/49 Serial driver";
 /*
  * Number of serial ports
  */
-#ifdef ENABLE_SERIAL_TXX9_PCI
-#define NR_PCI_BOARDS   4
-#define UART_NR  (4 + NR_PCI_BOARDS)
-#else
-#define UART_NR  4
-#endif
+#define UART_NR  CONFIG_SERIAL_TXX9_NR_UARTS
 
 #define HIGH_BITS_OFFSET        ((sizeof(long)-sizeof(int))*8)
 
@@ -987,6 +982,7 @@ int __init early_serial_txx9_setup(struct uart_port *port)
 }
 
 #ifdef ENABLE_SERIAL_TXX9_PCI
+#ifdef CONFIG_PM
 /**
  *      serial_txx9_suspend_port - suspend one serial port
  *      @line:  serial line number
@@ -1008,6 +1004,7 @@ static void serial_txx9_resume_port(int line)
 {
         uart_resume_port(&serial_txx9_reg, &serial_txx9_ports[line].port);
 }
+#endif
 
 static DEFINE_MUTEX(serial_txx9_mutex);
 
@@ -1118,6 +1115,7 @@ static void __devexit pciserial_txx9_remove_one(struct pci_dev *dev)
         }
 }
 
+#ifdef CONFIG_PM
 static int pciserial_txx9_suspend_one(struct pci_dev *dev, pm_message_t state)
 {
         int line = (int)(long)pci_get_drvdata(dev);
@@ -1142,11 +1140,10 @@ static int pciserial_txx9_resume_one(struct pci_dev *dev)
         }
         return 0;
 }
+#endif
 
-static struct pci_device_id serial_txx9_pci_tbl[] = {
-        {       PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0, 0, 0 },
+static const struct pci_device_id serial_txx9_pci_tbl[] = {
+        { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC) },
         { 0, }
 };
 
@@ -1154,8 +1151,10 @@ static struct pci_driver serial_txx9_pci_driver = {
         .name           = "serial_txx9",
         .probe          = pciserial_txx9_init_one,
         .remove         = __devexit_p(pciserial_txx9_remove_one),
+#ifdef CONFIG_PM
         .suspend        = pciserial_txx9_suspend_one,
         .resume         = pciserial_txx9_resume_one,
+#endif
         .id_table       = serial_txx9_pci_tbl,
 };