On 10/11/14 23:20, H Hartley Sweeten wrote:
The APCI-1564 boards do not actually have an AMCC PCI controller. According to ADDI-DATA, the boards have always used an FPGA with a PCI core. Unfortunately, there are two major revisions of the FPGA and they use different I/O mappings. Fix the driver so that both I/O map revisions work correctly. The counter/timer code in hwdrv_apci1564.c is still broken due to comedi API violations. H Hartley Sweeten (15): staging: comedi: addi_apci_1564: board does not use an AMCC PCI controller staging: comedi: addi_apci_1564: use correct I/O base for APCI1564_DI_INT_STATUS_REG staging: comedi: addi_apci_1564: store PCI BAR 1 base address in private data staging: comedi: addi_apci_1564: use dev->iobase for main registers staging: comedi: addi_apci_1564: detect PLD revision for I/O mapping staging: comedi: addi_apci_1564: fix dev->iobase for all PLD revisions staging: comedi: addi_apci_1564: fix timer iobase for all PLD revisions staging: comedi: addi_apci_1564: fix counter code in main driver source staging: comedi: addi_apci_1564: move counter register defines to driver staging: comedi: addi_apci_1564: split timer and counter subdevices staging: comedi: addi_tcw.h: provide generic defines for the ADDI-DATA TCW staging: comedi: addi_apci_1564: use addi_tcw.h defines for timer staging: comedi: addi_apci_1564: use addi_tcw.h defines for counters staging: comedi: addi_apci_1564: enable support for PLD Rev 1.0 I/O mapping staging: comedi: addi_watchdog: use addi_tcw.h defines for watchdog .../comedi/drivers/addi-data/hwdrv_apci1564.c | 371 +++++++++------------ drivers/staging/comedi/drivers/addi_apci_1564.c | 260 ++++++++++----- drivers/staging/comedi/drivers/addi_tcw.h | 56 ++++ drivers/staging/comedi/drivers/addi_watchdog.c | 30 +- 4 files changed, 404 insertions(+), 313 deletions(-) create mode 100644 drivers/staging/comedi/drivers/addi_tcw.h
Not quite there yet, but hopefully the driver can be bent to comedi's will eventually. Thanks for resolving the ambiguities surrounding the register mappings!
Reviewed-by: Ian Abbott <abbotti@xxxxxxxxx> -- -=( Ian Abbott @ MEV Ltd. E-mail: <abbotti@xxxxxxxxx> )=- -=( Web: http://www.mev.co.uk/ )=- _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
