5 files changed, 42 insertions, 15 deletions

diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 52b0a0558ed4..0e21f583690e 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -865,6 +865,8 @@ enum pci_board_num_t {
         pbn_b0_2_921600,
         pbn_b0_4_921600,
 
+        pbn_b0_2_1130000,
+
         pbn_b0_4_1152000,
 
         pbn_b0_bt_1_115200,
@@ -999,6 +1001,14 @@ static struct pciserial_board pci_boards[] __devinitdata = {
                 .base_baud      = 921600,
                 .uart_offset    = 8,
         },
+
+        [pbn_b0_2_1130000] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 2,
+                .base_baud      = 1130000,
+                .uart_offset    = 8,
+        },
+
         [pbn_b0_4_1152000] = {
                 .flags          = FL_BASE0,
                 .num_ports      = 4,
@@ -1868,6 +1878,16 @@ static struct pci_device_id serial_pci_tbl[] = {
         {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954,
                 PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL, 0, 0,
                 pbn_b0_4_1152000 },
+
+                /*
+                 * The below card is a little controversial since it is the
+                 * subject of a PCI vendor/device ID clash.  (See
+                 * www.ussg.iu.edu/hypermail/linux/kernel/0303.1/0516.html).
+                 * For now just used the hex ID 0x950a.
+                 */
+        {       PCI_VENDOR_ID_OXSEMI, 0x950a,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_2_1130000 },
         {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                 pbn_b0_4_115200 },
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
index 7911912f50c7..8efbd6d1d6a4 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -185,7 +185,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
         memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +
             L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);
         if (is_con) {
-                mem_addr = (u8 *) m8xx_cpm_hostalloc(memsz);
+                mem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8));
                 dma_addr = 0;
         } else
                 mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h
index 5bf3c45521f4..18753193f59b 100644
--- a/drivers/serial/jsm/jsm.h
+++ b/drivers/serial/jsm/jsm.h
@@ -89,7 +89,7 @@ enum {
 #define WRITEBUFLEN     ((4096) + 4)
 #define MYFLIPLEN       N_TTY_BUF_SIZE
 
-#define JSM_VERSION     "jsm: 1.1-1-INKERNEL"
+#define JSM_VERSION     "jsm: 1.2-1-INKERNEL"
 #define JSM_PARTNUM     "40002438_A-INKERNEL"
 
 struct jsm_board;
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c
index cc5d21300ed3..7e56c7824194 100644
--- a/drivers/serial/jsm/jsm_driver.c
+++ b/drivers/serial/jsm/jsm_driver.c
@@ -22,6 +22,7 @@
  * Scott H Kilau <Scott_Kilau@digi.com>
  * Wendy Xiong   <wendyx@us.ltcfwd.linux.ibm.com>
  *
+ *
  ***********************************************************************/
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
@@ -42,7 +43,7 @@ struct uart_driver jsm_uart_driver = {
         .owner          = THIS_MODULE,
         .driver_name    = JSM_DRIVER_NAME,
         .dev_name       = "ttyn",
-        .major          = 253,
+        .major          = 0,
         .minor          = JSM_MINOR_START,
         .nr             = NR_PORTS,
 };
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
index 3a11a69feb44..6f22b42d9337 100644
--- a/drivers/serial/jsm/jsm_neo.c
+++ b/drivers/serial/jsm/jsm_neo.c
@@ -48,8 +48,9 @@ static inline void neo_pci_posting_flush(struct jsm_board *bd)
 
 static void neo_set_cts_flow_control(struct jsm_channel *ch)
 {
-        u8 ier = readb(&ch->ch_neo_uart->ier);
-        u8 efr = readb(&ch->ch_neo_uart->efr);
+        u8 ier, efr;
+        ier = readb(&ch->ch_neo_uart->ier);
+        efr = readb(&ch->ch_neo_uart->efr);
 
         jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting CTSFLOW\n");
 
@@ -78,8 +79,9 @@ static void neo_set_cts_flow_control(struct jsm_channel *ch)
 
 static void neo_set_rts_flow_control(struct jsm_channel *ch)
 {
-        u8 ier = readb(&ch->ch_neo_uart->ier);
-        u8 efr = readb(&ch->ch_neo_uart->efr);
+        u8 ier, efr;
+        ier = readb(&ch->ch_neo_uart->ier);
+        efr = readb(&ch->ch_neo_uart->efr);
 
         jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting RTSFLOW\n");
 
@@ -117,8 +119,9 @@ static void neo_set_rts_flow_control(struct jsm_channel *ch)
 
 static void neo_set_ixon_flow_control(struct jsm_channel *ch)
 {
-        u8 ier = readb(&ch->ch_neo_uart->ier);
-        u8 efr = readb(&ch->ch_neo_uart->efr);
+        u8 ier, efr;
+        ier = readb(&ch->ch_neo_uart->ier);
+        efr = readb(&ch->ch_neo_uart->efr);
 
         jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXON FLOW\n");
 
@@ -153,8 +156,9 @@ static void neo_set_ixon_flow_control(struct jsm_channel *ch)
 
 static void neo_set_ixoff_flow_control(struct jsm_channel *ch)
 {
-        u8 ier = readb(&ch->ch_neo_uart->ier);
-        u8 efr = readb(&ch->ch_neo_uart->efr);
+        u8 ier, efr;
+        ier = readb(&ch->ch_neo_uart->ier);
+        efr = readb(&ch->ch_neo_uart->efr);
 
         jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXOFF FLOW\n");
 
@@ -190,8 +194,9 @@ static void neo_set_ixoff_flow_control(struct jsm_channel *ch)
 
 static void neo_set_no_input_flow_control(struct jsm_channel *ch)
 {
-        u8 ier = readb(&ch->ch_neo_uart->ier);
-        u8 efr = readb(&ch->ch_neo_uart->efr);
+        u8 ier, efr;
+        ier = readb(&ch->ch_neo_uart->ier);
+        efr = readb(&ch->ch_neo_uart->efr);
 
         jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Input FLOW\n");
 
@@ -228,8 +233,9 @@ static void neo_set_no_input_flow_control(struct jsm_channel *ch)
 
 static void neo_set_no_output_flow_control(struct jsm_channel *ch)
 {
-        u8 ier = readb(&ch->ch_neo_uart->ier);
-        u8 efr = readb(&ch->ch_neo_uart->efr);
+        u8 ier, efr;
+        ier = readb(&ch->ch_neo_uart->ier);
+        efr = readb(&ch->ch_neo_uart->efr);
 
         jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Output FLOW\n");