staging: comedi: 8255_pci: add support for the PCI-DIO96H board

Add support for the Measurement Computing PCI-DIO96H board to the
generic 8255_pci driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 1bd7e93fa80c30fdf2377692e8e39f9d5e54f9c7..3f67b98f755845522aa5bf82200984307a2cd3af 100644 (file)
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -558,7 +558,8 @@ config COMEDI_8255_PCI
 
          Supported boards:
            ADlink - PCI-7224, PCI-7248, and PCI-7296
-           Measurement Computing - PCI-DIO24, PCI-DIO24H and PCI-DIO48H
+           Measurement Computing - PCI-DIO24, PCI-DIO24H, PCI-DIO48H and
+                                   PCI-DIO96H
 
          To compile this driver as a module, choose M here: the module will
          be called 8255_pci.

diff --git a/drivers/staging/comedi/drivers/8255_pci.c b/drivers/staging/comedi/drivers/8255_pci.c
index e011b0ae9294270b7a5e343b63b30f9c8e046b61..075f98bd257e93824b021ce84c0d9b91b68d08ee 100644 (file)
--- a/drivers/staging/comedi/drivers/8255_pci.c
+++ b/drivers/staging/comedi/drivers/8255_pci.c
@@ -34,6 +34,7 @@ Devices: (ADLink) PCI-7224 [adl_pci-7224] - 24 channels
         (Measurement Computing) PCI-DIO24 [cb_pci-dio24] - 24 channels
         (Measurement Computing) PCI-DIO24H [cb_pci-dio24h] - 24 channels
         (Measurement Computing) PCI-DIO48H [cb_pci-dio48h] - 48 channels
+        (Measurement Computing) PCI-DIO96H [cb_pci-dio96h] - 96 channels
 Author: H Hartley Sweeten <hsweeten@visionengravers.com>
 Updated: Wed, 12 Sep 2012 11:52:01 -0700
 Status: untested
@@ -62,6 +63,7 @@ Configuration Options: not applicable, uses PCI auto config
 
 #define PCI_DEVICE_ID_CB_PCIDIO48H     0x000b
 #define PCI_DEVICE_ID_CB_PCIDIO24H     0x0014
+#define PCI_DEVICE_ID_CB_PCIDIO96H     0x0017
 #define PCI_DEVICE_ID_CB_PCIDIO24      0x0028
 
 struct pci_8255_boardinfo {
@@ -102,6 +104,11 @@ static const struct pci_8255_boardinfo pci_8255_boards[] = {
                .device         = PCI_DEVICE_ID_CB_PCIDIO48H,
                .dio_badr       = 1,
                .n_8255         = 2,
+       }, {
+               .name           = "cb_pci-dio96h",
+               .device         = PCI_DEVICE_ID_CB_PCIDIO96H,
+               .dio_badr       = 2,
+               .n_8255         = 4,
        },
 };
 
@@ -206,6 +213,7 @@ static DEFINE_PCI_DEVICE_TABLE(pci_8255_pci_table) = {
        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO24) },
        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO24H) },
        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO48H) },
+       { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO96H) },
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, pci_8255_pci_table);