Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: cb_pcimdas: add support for PCIe-DAS1602/16

Browse Source 
The Measurement Computing PCIe-DAS1602/16 is a PCI-Express version of
the PCIM-DAS1602/16, but has a different PCI device ID.  Add support
for this device and update the driver description, Kconfig description
and MODULE_DESCRIPTION.

Thanks to Christoph Langbein for supplying the PCI device ID.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2014-10-13 13:41:22 +01:00 committed by Greg Kroah-Hartman
parent 79f54ac18b
commit 4e3d14af12
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/comedi/Kconfig
View File

@ -939,11 +939,11 @@ config COMEDI_CB_PCIDDA
called cb_pcidda.
config COMEDI_CB_PCIMDAS
tristate "MeasurementComputing PCIM-DAS1602/16 support"
tristate "MeasurementComputing PCIM-DAS1602/16, PCIe-DAS1602/16 support"
select COMEDI_8255
---help---
Enable support for ComputerBoards/MeasurementComputing PCI Migration
series PCIM-DAS1602/16
series PCIM-DAS1602/16 and PCIe-DAS1602/16.
To compile this driver as a module, choose M here: the module will be
called cb_pcimdas.

21
drivers/staging/comedi/drivers/cb_pcimdas.c
View File

@ -1,6 +1,6 @@
/*
* comedi/drivers/cb_pcimdas.c
* Comedi driver for Computer Boards PCIM-DAS1602/16
* Comedi driver for Computer Boards PCIM-DAS1602/16 and PCIe-DAS1602/16
*
* COMEDI - Linux Control and Measurement Device Interface
* Copyright (C) 2000 David A. Schleef <ds@schleef.org>
@ -19,24 +19,26 @@
/*
* Driver: cb_pcimdas
* Description: Measurement Computing PCI Migration series boards
* Devices: [ComputerBoards] PCIM-DAS1602/16 (cb_pcimdas)
* Devices: [ComputerBoards] PCIM-DAS1602/16 (cb_pcimdas), PCIe-DAS1602/16
* Author: Richard Bytheway
* Updated: Wed, 13 Nov 2002 12:34:56 +0000
* Updated: Mon, 13 Oct 2014 11:57:39 +0000
* Status: experimental
*
* Written to support the PCIM-DAS1602/16 on a 2.4 series kernel.
* Written to support the PCIM-DAS1602/16 and PCIe-DAS1602/16.
*
* Configuration Options:
* none
*
* Manual configuration of PCI cards is not supported; they are configured
* Manual configuration of PCI(e) cards is not supported; they are configured
* automatically.
*
* Developed from cb_pcidas and skel by Richard Bytheway (mocelet@sucs.org).
* Only supports DIO, AO and simple AI in it's present form.
* No interrupts, multi channel or FIFO AI,
* although the card looks like it could support this.
* See http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf for more details.
*
* http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf
* http://www.mccdaq.com/PDFs/Manuals/pcie-das1602-16.pdf
*/
#include <linux/module.h>
@ -48,7 +50,7 @@
#include "plx9052.h"
#include "8255.h"
/* Registers for the PCIM-DAS1602/16 */
/* Registers for the PCIM-DAS1602/16 and PCIe-DAS1602/16 */
/* DAC Offsets */
#define ADC_TRIG 0
@ -254,7 +256,8 @@ static int cb_pcimdas_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id cb_pcimdas_pci_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0056) },
{ PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0056) }, /* PCIM-DAS1602/16 */
{ PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0115) }, /* PCIe-DAS1602/16 */
{ 0 }
};
MODULE_DEVICE_TABLE(pci, cb_pcimdas_pci_table);
@ -268,5 +271,5 @@ static struct pci_driver cb_pcimdas_pci_driver = {
module_comedi_pci_driver(cb_pcimdas_driver, cb_pcimdas_pci_driver);
MODULE_AUTHOR("Comedi http://www.comedi.org");
MODULE_DESCRIPTION("Comedi low-level driver");
MODULE_DESCRIPTION("Comedi driver for PCIM-DAS1602/16 and PCIe-DAS1602/16");
MODULE_LICENSE("GPL");