Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

jsm: add new supported board to jsm serial driver

Add new PCI Express Neo/JSM board to the supported list of drivers in
the JSM driver.

Signed-off-by: Scott Kilau <scottk@digi.com>
Acked-by: Ananda V <avenkat@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Scott Kilau and committed by
Linus Torvalds
99da9047 6f441fe9

+7 -1
+1
drivers/serial/jsm/jsm.h
··· 373 373 #define PCI_DEVICE_NEO_2DB9PRI_PCI_NAME "Neo 2 - DB9 Universal PCI - Powered Ring Indicator" 374 374 #define PCI_DEVICE_NEO_2RJ45_PCI_NAME "Neo 2 - RJ45 Universal PCI" 375 375 #define PCI_DEVICE_NEO_2RJ45PRI_PCI_NAME "Neo 2 - RJ45 Universal PCI - Powered Ring Indicator" 376 + #define PCIE_DEVICE_NEO_IBM_PCI_NAME "Neo 4 - PCI Express - IBM" 376 377 377 378 /* 378 379 * Our Global Variables.
+5 -1
drivers/serial/jsm/jsm_driver.c
··· 82 82 /* store the info for the board we've found */ 83 83 brd->boardnum = adapter_count++; 84 84 brd->pci_dev = pdev; 85 - brd->maxports = 2; 85 + if (pdev->device == PCIE_DEVICE_ID_NEO_4_IBM) 86 + brd->maxports = 4; 87 + else 88 + brd->maxports = 2; 86 89 87 90 spin_lock_init(&brd->bd_lock); 88 91 spin_lock_init(&brd->bd_intr_lock); ··· 211 208 { PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2DB9PRI), 0, 0, 1 }, 212 209 { PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2RJ45), 0, 0, 2 }, 213 210 { PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2RJ45PRI), 0, 0, 3 }, 211 + { PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_4_IBM), 0, 0, 4 }, 214 212 { 0, } 215 213 }; 216 214 MODULE_DEVICE_TABLE(pci, jsm_pci_tbl);
+1
include/linux/pci_ids.h
··· 1429 1429 #define PCI_DEVICE_ID_NEO_2DB9PRI 0x00C9 1430 1430 #define PCI_DEVICE_ID_NEO_2RJ45 0x00CA 1431 1431 #define PCI_DEVICE_ID_NEO_2RJ45PRI 0x00CB 1432 + #define PCIE_DEVICE_ID_NEO_4_IBM 0x00F4 1432 1433 1433 1434 #define PCI_VENDOR_ID_XIRCOM 0x115d 1434 1435 #define PCI_DEVICE_ID_XIRCOM_RBM56G 0x0101