* [PATCH] Add new supported board to jsm serial driver.
@ 2008-04-28 15:32 Kilau, Scott
2008-04-28 19:00 ` V. Ananda Krishnan
0 siblings, 1 reply; 2+ messages in thread
From: Kilau, Scott @ 2008-04-28 15:32 UTC (permalink / raw)
To: linux-kernel; +Cc: akpm
From: Scott Kilau <scottk@digi.com>
[PATCH] 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>
diff -uprN -X /usr/src/kernels/linux-2.6.25.orig/Documentation/dontdiff
/usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm_driver.c
/usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm_driver.c
--- /usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm_driver.c
2008-04-16 21:49:44.000000000 -0500
+++ /usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm_driver.c
2008-04-25 11:35:31.000000000 -0500
@@ -82,7 +82,10 @@ static int jsm_probe_one(struct pci_dev
/* store the info for the board we've found */
brd->boardnum = adapter_count++;
brd->pci_dev = pdev;
- brd->maxports = 2;
+ if (pdev->device == PCIE_DEVICE_ID_NEO_4_IBM)
+ brd->maxports = 4;
+ else
+ brd->maxports = 2;
spin_lock_init(&brd->bd_lock);
spin_lock_init(&brd->bd_intr_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);
diff -uprN -X /usr/src/kernels/linux-2.6.25.orig/Documentation/dontdiff
/usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm.h
/usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm.h
--- /usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm.h
2008-04-16 21:49:44.000000000 -0500
+++ /usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm.h
2008-04-25 10:08:04.000000000 -0500
@@ -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.
diff -uprN -X /usr/src/kernels/linux-2.6.25.orig/Documentation/dontdiff
/usr/src/kernels/linux-2.6.25.orig/include/linux/pci_ids.h
/usr/src/kernels/linux-2.6.25/include/linux/pci_ids.h
--- /usr/src/kernels/linux-2.6.25.orig/include/linux/pci_ids.h
2008-04-16 21:49:44.000000000 -0500
+++ /usr/src/kernels/linux-2.6.25/include/linux/pci_ids.h
2008-04-25 10:10:32.000000000 -0500
@@ -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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Add new supported board to jsm serial driver.
2008-04-28 15:32 [PATCH] Add new supported board to jsm serial driver Kilau, Scott
@ 2008-04-28 19:00 ` V. Ananda Krishnan
0 siblings, 0 replies; 2+ messages in thread
From: V. Ananda Krishnan @ 2008-04-28 19:00 UTC (permalink / raw)
To: Kilau, Scott; +Cc: linux-kernel, akpm
Acked-by: Ananda V <avenkat@us.ibm.com>
Kilau, Scott wrote:
> From: Scott Kilau <scottk@digi.com>
>
> [PATCH] 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>
>
>
> diff -uprN -X /usr/src/kernels/linux-2.6.25.orig/Documentation/dontdiff
> /usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm_driver.c
> /usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm_driver.c
> --- /usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm_driver.c
> 2008-04-16 21:49:44.000000000 -0500
> +++ /usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm_driver.c
> 2008-04-25 11:35:31.000000000 -0500
> @@ -82,7 +82,10 @@ static int jsm_probe_one(struct pci_dev
> /* store the info for the board we've found */
> brd->boardnum = adapter_count++;
> brd->pci_dev = pdev;
> - brd->maxports = 2;
> + if (pdev->device == PCIE_DEVICE_ID_NEO_4_IBM)
> + brd->maxports = 4;
> + else
> + brd->maxports = 2;
>
> spin_lock_init(&brd->bd_lock);
> spin_lock_init(&brd->bd_intr_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);
> diff -uprN -X /usr/src/kernels/linux-2.6.25.orig/Documentation/dontdiff
> /usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm.h
> /usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm.h
> --- /usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm.h
> 2008-04-16 21:49:44.000000000 -0500
> +++ /usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm.h
> 2008-04-25 10:08:04.000000000 -0500
> @@ -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.
> diff -uprN -X /usr/src/kernels/linux-2.6.25.orig/Documentation/dontdiff
> /usr/src/kernels/linux-2.6.25.orig/include/linux/pci_ids.h
> /usr/src/kernels/linux-2.6.25/include/linux/pci_ids.h
> --- /usr/src/kernels/linux-2.6.25.orig/include/linux/pci_ids.h
> 2008-04-16 21:49:44.000000000 -0500
> +++ /usr/src/kernels/linux-2.6.25/include/linux/pci_ids.h
> 2008-04-25 10:10:32.000000000 -0500
> @@ -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
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-04-28 19:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-28 15:32 [PATCH] Add new supported board to jsm serial driver Kilau, Scott
2008-04-28 19:00 ` V. Ananda Krishnan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.