Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99da9047 authored by Scott Kilau's avatar Scott Kilau Committed by Linus Torvalds
Browse files

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: default avatarScott Kilau <scottk@digi.com>
Acked-by: default avatarAnanda V <avenkat@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6f441fe9

drivers/serial/jsm/jsm.h

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ struct neo_uart_struct { 
#define PCI_DEVICE_NEO_2DB9PRI_PCI_NAME		"Neo 2 - DB9 Universal PCI - Powered Ring Indicator"

#define PCI_DEVICE_NEO_2RJ45_PCI_NAME		"Neo 2 - RJ45 Universal PCI"

#define PCI_DEVICE_NEO_2RJ45PRI_PCI_NAME	"Neo 2 - RJ45 Universal PCI - Powered Ring Indicator"

#define PCIE_DEVICE_NEO_IBM_PCI_NAME		"Neo 4 - PCI Express - IBM"



/*

 * Our Global Variables.

drivers/serial/jsm/jsm_driver.c

+5 −1
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* store the info for the board we've found */

	brd->boardnum = adapter_count++;

	brd->pci_dev = pdev;

	if (pdev->device == PCIE_DEVICE_ID_NEO_4_IBM)

		brd->maxports = 4;

	else

		brd->maxports = 2;



	spin_lock_init(&brd->bd_lock);
@@ -208,6 +211,7 @@ static struct pci_device_id jsm_pci_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2DB9PRI), 0, 0, 1 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2RJ45), 0, 0, 2 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2RJ45PRI), 0, 0, 3 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_4_IBM), 0, 0, 4 },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, jsm_pci_tbl);

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1429,6 +1429,7 @@ 
#define PCI_DEVICE_ID_NEO_2DB9PRI       0x00C9

#define PCI_DEVICE_ID_NEO_2RJ45         0x00CA

#define PCI_DEVICE_ID_NEO_2RJ45PRI      0x00CB

#define PCIE_DEVICE_ID_NEO_4_IBM        0x00F4



#define PCI_VENDOR_ID_XIRCOM		0x115d

#define PCI_DEVICE_ID_XIRCOM_RBM56G	0x0101