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

Commit 293b2265 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

jsm: add support for additional Neo cards 



Add device ids for additional Neo cards.  The ids come from the dgnc
driver.

Signed-off-by: default avatarBill Pemberton <wfp5p@worldbroken.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 69e273c0

drivers/tty/serial/jsm/jsm.h

+10 −0
Original line number Diff line number Diff line
@@ -67,6 +67,16 @@ do { \ 
#define MAXPORTS	8

#define MAX_STOPS_SENT	5



/* Board ids */

#define PCI_DEVICE_ID_NEO_4             0x00B0

#define PCI_DEVICE_ID_NEO_1_422         0x00CC

#define PCI_DEVICE_ID_NEO_1_422_485     0x00CD

#define PCI_DEVICE_ID_NEO_2_422_485     0x00CE

#define PCIE_DEVICE_ID_NEO_8            0x00F0

#define PCIE_DEVICE_ID_NEO_4            0x00F1

#define PCIE_DEVICE_ID_NEO_4RJ45        0x00F2

#define PCIE_DEVICE_ID_NEO_8RJ45        0x00F3



/* Board type definitions */



#define T_NEO		0000

drivers/tty/serial/jsm/jsm_driver.c

+34 −4
Original line number Diff line number Diff line
@@ -93,12 +93,34 @@ 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)



	switch (pdev->device) {



	case PCI_DEVICE_ID_NEO_2DB9:

	case PCI_DEVICE_ID_NEO_2DB9PRI:

	case PCI_DEVICE_ID_NEO_2RJ45:

	case PCI_DEVICE_ID_NEO_2RJ45PRI:

	case PCI_DEVICE_ID_NEO_2_422_485:

		brd->maxports = 2;

		break;



	case PCI_DEVICE_ID_NEO_4:

	case PCIE_DEVICE_ID_NEO_4:

	case PCIE_DEVICE_ID_NEO_4RJ45:

	case PCIE_DEVICE_ID_NEO_4_IBM:

		brd->maxports = 4;

	else if (pdev->device == PCI_DEVICE_ID_DIGI_NEO_8)

		break;



	case PCI_DEVICE_ID_DIGI_NEO_8:

	case PCIE_DEVICE_ID_NEO_8:

	case PCIE_DEVICE_ID_NEO_8RJ45:

		brd->maxports = 8;

	else

		brd->maxports = 2;

		break;



	default:

		brd->maxports = 1;

		break;

	}



	spin_lock_init(&brd->bd_intr_lock);
@@ -209,6 +231,14 @@ static struct pci_device_id jsm_pci_tbl[] = { 
	{ 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 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_NEO_8), 0, 0, 5 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_4), 0, 0, 6 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_1_422), 0, 0, 7 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_1_422_485), 0, 0, 8 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2_422_485), 0, 0, 9 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_8), 0, 0, 10 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_4), 0, 0, 11 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_4RJ45), 0, 0, 12 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_8RJ45), 0, 0, 13 },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, jsm_pci_tbl);