staging: comedi: ni_660x: Add NI PCI-6608 to list of supported devices
authorSpencer E. Olson <olsonse@umich.edu>
Wed, 3 Oct 2018 20:56:10 +0000 (14:56 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Oct 2018 13:36:05 +0000 (15:36 +0200)
Previously, only the PXI version of the NI-6608 board was supported.  This
change adds support for the PCI version as well.

Signed-off-by: Spencer E. Olson <olsonse@umich.edu>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_660x.c

index 498b286..0dfaf8e 100644 (file)
@@ -7,7 +7,7 @@
  * Driver: ni_660x
  * Description: National Instruments 660x counter/timer boards
  * Devices: [National Instruments] PCI-6601 (ni_660x), PCI-6602, PXI-6602,
- *   PXI-6608, PCI-6624, PXI-6624
+ *   PCI-6608, PXI-6608, PCI-6624, PXI-6624
  * Author: J.P. Mellor <jpmellor@rose-hulman.edu>,
  *   Herman.Bruyninckx@mech.kuleuven.ac.be,
  *   Wim.Meeussen@mech.kuleuven.ac.be,
@@ -202,6 +202,7 @@ enum ni_660x_boardid {
        BOARD_PCI6601,
        BOARD_PCI6602,
        BOARD_PXI6602,
+       BOARD_PCI6608,
        BOARD_PXI6608,
        BOARD_PCI6624,
        BOARD_PXI6624
@@ -225,6 +226,10 @@ static const struct ni_660x_board ni_660x_boards[] = {
                .name           = "PXI-6602",
                .n_chips        = 2,
        },
+       [BOARD_PCI6608] = {
+               .name           = "PCI-6608",
+               .n_chips        = 2,
+       },
        [BOARD_PXI6608] = {
                .name           = "PXI-6608",
                .n_chips        = 2,
@@ -925,6 +930,7 @@ static const struct pci_device_id ni_660x_pci_table[] = {
        { PCI_VDEVICE(NI, 0x1310), BOARD_PCI6602 },
        { PCI_VDEVICE(NI, 0x1360), BOARD_PXI6602 },
        { PCI_VDEVICE(NI, 0x2c60), BOARD_PCI6601 },
+       { PCI_VDEVICE(NI, 0x2db0), BOARD_PCI6608 },
        { PCI_VDEVICE(NI, 0x2cc0), BOARD_PXI6608 },
        { PCI_VDEVICE(NI, 0x1e30), BOARD_PCI6624 },
        { PCI_VDEVICE(NI, 0x1e40), BOARD_PXI6624 },