]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: ni_pcimio: Adds PXI-6251 to supported boards
authorSpencer E. Olson <olsonse@umich.edu>
Tue, 12 Jan 2016 06:29:33 +0000 (23:29 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Feb 2016 02:35:16 +0000 (18:35 -0800)
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_pcimio.c

index 30a5a75d1fe7b5ee6c60174f7d0ad50acb5cb374..231e37d6b7c61f9eb32c70a7dbc1d9ad81a4f192 100644 (file)
@@ -26,7 +26,8 @@ Devices: [National Instruments] PCI-MIO-16XE-50 (ni_pcimio),
   PXI-6040E, PCI-6030E, PCI-6031E, PCI-6032E, PCI-6033E, PCI-6071E, PCI-6023E,
   PCI-6024E, PCI-6025E, PXI-6025E, PCI-6034E, PCI-6035E, PCI-6052E,
   PCI-6110, PCI-6111, PCI-6220, PCI-6221, PCI-6224, PXI-6224,
-  PCI-6225, PXI-6225, PCI-6229, PCI-6250, PCI-6251, PCIe-6251, PXIe-6251,
+  PCI-6225, PXI-6225, PCI-6229, PCI-6250,
+  PCI-6251, PXI-6251, PCIe-6251, PXIe-6251,
   PCI-6254, PCI-6259, PCIe-6259,
   PCI-6280, PCI-6281, PXI-6281, PCI-6284, PCI-6289,
   PCI-6711, PXI-6711, PCI-6713, PXI-6713,
@@ -193,6 +194,7 @@ enum ni_pcimio_boardid {
        BOARD_PCI6229,
        BOARD_PCI6250,
        BOARD_PCI6251,
+       BOARD_PXI6251,
        BOARD_PCIE6251,
        BOARD_PXIE6251,
        BOARD_PCI6254,
@@ -811,6 +813,21 @@ static const struct ni_board_struct ni_boards[] = {
                .ao_speed       = 350,
                .caldac         = { caldac_none },
        },
+       [BOARD_PXI6251] = {
+               .name           = "pxi-6251",
+               .n_adchan       = 16,
+               .ai_maxdata     = 0xffff,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_628x,
+               .ai_speed       = 800,
+               .n_aochan       = 2,
+               .ao_maxdata     = 0xffff,
+               .ao_fifo_depth  = 8191,
+               .ao_range_table = &range_ni_M_625x_ao,
+               .reg_type       = ni_reg_625x,
+               .ao_speed       = 350,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCIE6251] = {
                .name           = "pcie-6251",
                .n_adchan       = 16,
@@ -1290,6 +1307,7 @@ static const struct pci_device_id ni_pcimio_pci_table[] = {
        { PCI_VDEVICE(NI, 0x71bc), BOARD_PCI6221_37PIN },
        { PCI_VDEVICE(NI, 0x717d), BOARD_PCIE6251 },
        { PCI_VDEVICE(NI, 0x72e8), BOARD_PXIE6251 },
+       { PCI_VDEVICE(NI, 0x70ad), BOARD_PXI6251 },
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, ni_pcimio_pci_table);