Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit 0db88006 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

kernel: incompatible change: rename all stuff 

Unfortunately, fmc-adc is too generic a module name, because we may
expect to have different ADC cards in the same VME rack, at a later
time (and all of them are fmc-adc, in a way).

Also, hardwiring the gateware name as "fmc/spec-fmc-adc-v1.1.bin" is
too specific -- what if 1.2 is a simple fix?

So, the gateware name is a simpler "fmc/adc-100m14b.bin" (which should
be hardware-specific enough while not including a version number.

The module is called fmc-adc-100m14b.ko.

The zio device name is "adc-100m14b" (the fmc- prefix would overflow
the 12-byte maximum device length -- forced by the control structure).
The trigger uses the same name (it's a separate namespace anyways.

This commit trivially updates the manual so all pathnames shown are
correct, leaving a serious manual review to a later time.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 66881887
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 60 deletions
doc/fmc-adc-driver.in
View file @ 0db88006
This diff is collapsed.
kernel/Makefile
View file @ 0db88006
...@@ -16,14 +16,14 @@ ccflags-y += -DDEBUG # temporary ...@@ -16,14 +16,14 @@ ccflags-y += -DDEBUG # temporary
subdirs-ccflags-y = $(ccflags-y) subdirs-ccflags-y = $(ccflags-y)
obj-m := fmc-adc.o obj-m := fmc-adc-100m14b.o
fmc-adc-objs = fa-zio-drv.o fmc-adc-100m14b-objs = fa-core.o
fmc-adc-objs += fa-core.o fmc-adc-100m14b-objs += fa-zio-drv.o
fmc-adc-objs += fa-zio-trg.o fmc-adc-100m14b-objs += fa-regtable.o
fmc-adc-objs += fa-dma.o fmc-adc-100m14b-objs += fa-zio-trg.o
fmc-adc-objs += onewire.o fmc-adc-100m14b-objs += fa-dma.o
fmc-adc-objs += spi.o fmc-adc-100m14b-objs += onewire.o
fmc-adc-objs += fa-regtable.o fmc-adc-100m14b-objs += spi.o
all modules: all modules:
$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) modules $(MAKE) -C $(LINUX) M=$(shell /bin/pwd) modules
......
kernel/fa-core.c
View file @ 0db88006
/* /*
* core fmc-adc driver * core fmc-adc-100m14b driver
* *
* Copyright (C) 2012 CERN (www.cern.ch) * Copyright (C) 2012 CERN (www.cern.ch)
* Author: Federico Vaga <federico.vaga@gmail.com> * Author: Federico Vaga <federico.vaga@gmail.com>
...@@ -127,6 +127,6 @@ module_init(fa_init); ...@@ -127,6 +127,6 @@ module_init(fa_init);
module_exit(fa_exit); module_exit(fa_exit);
MODULE_AUTHOR("Federico Vaga"); MODULE_AUTHOR("Federico Vaga");
MODULE_DESCRIPTION("FMC-ADC Linux Driver"); MODULE_DESCRIPTION("FMC-ADC-100MS-14b Linux Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION("0.8"); MODULE_VERSION("0.8");
kernel/fa-zio-drv.c
View file @ 0db88006
...@@ -1011,7 +1011,7 @@ static int zfad_zio_probe(struct zio_device *zdev) ...@@ -1011,7 +1011,7 @@ static int zfad_zio_probe(struct zio_device *zdev)
fa->fmc->op->gpio_config(fa->fmc, zfat_gpio_cfg, fa->fmc->op->gpio_config(fa->fmc, zfat_gpio_cfg,
ARRAY_SIZE(zfat_gpio_cfg)); ARRAY_SIZE(zfat_gpio_cfg));
/* Request IRQ */ /* Request IRQ */
err = fa->fmc->op->irq_request(fa->fmc, zfad_irq, "fmc-adc", err = fa->fmc->op->irq_request(fa->fmc, zfad_irq, "fmc-adc-100m14b",
IRQF_SHARED); IRQF_SHARED);
if (err) if (err)
dev_err(fa->fmc->hwdev, "can't request irq %i (err %i)\n", dev_err(fa->fmc->hwdev, "can't request irq %i (err %i)\n",
...@@ -1111,21 +1111,21 @@ static struct zio_device zfad_tmpl = { ...@@ -1111,21 +1111,21 @@ static struct zio_device zfad_tmpl = {
.ext_zattr = zfad_dev_ext_zattr, .ext_zattr = zfad_dev_ext_zattr,
.n_ext_attr = ARRAY_SIZE(zfad_dev_ext_zattr), .n_ext_attr = ARRAY_SIZE(zfad_dev_ext_zattr),
}, },
/* This driver work only with the fmc-adc-trg */ /* This driver prefers its own trigger */
.preferred_trigger = "fmc-adc-trg", .preferred_trigger = "adc-100m14b",
.preferred_buffer = "vmalloc", .preferred_buffer = "vmalloc",
}; };
/* List of supported boards */ /* List of supported boards */
static const struct zio_device_id zfad_table[] = { static const struct zio_device_id zfad_table[] = {
{"fmc-adc", &zfad_tmpl}, {"adc-100m14b", &zfad_tmpl},
{}, {},
}; };
static struct zio_driver fa_zdrv = { static struct zio_driver fa_zdrv = {
.driver = { .driver = {
.name = "fmc-adc", .name = "adc-100m14b",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.id_table = zfad_table, .id_table = zfad_table,
...@@ -1199,9 +1199,10 @@ int fa_zio_init(struct fa_dev *fa) ...@@ -1199,9 +1199,10 @@ int fa_zio_init(struct fa_dev *fa)
} }
/* Register our trigger hardware */ /* Register our trigger hardware */
err = zio_register_trig(&zfat_type, "fmc-adc-trg"); err = zio_register_trig(&zfat_type, "adc-100m14b");
if (err) { if (err) {
dev_err(hwdev, "Cannot register ZIO trigger fmc-adc-trig\n"); dev_err(hwdev, "Cannot register ZIO trigger type"
" \"adc-100m14b\"\n");
goto out_trg; goto out_trg;
} }
...@@ -1218,9 +1219,10 @@ int fa_zio_init(struct fa_dev *fa) ...@@ -1218,9 +1219,10 @@ int fa_zio_init(struct fa_dev *fa)
fa->hwzdev->priv_d = fa; fa->hwzdev->priv_d = fa;
/* Register the hardware zio_device */ /* Register the hardware zio_device */
err = zio_register_device(fa->hwzdev, "fmc-adc", fa->fmc->device_id); err = zio_register_device(fa->hwzdev, "adc-100m14b",
fa->fmc->device_id);
if (err) { if (err) {
dev_err(hwdev, "Cannot register ZIO device fmc-adc\n"); dev_err(hwdev, "Cannot register ZIO device fmc-adc-100m14b\n");
goto out_dev; goto out_dev;
} }
return 0; return 0;
......
kernel/fmc-adc.h
View file @ 0db88006
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/zio.h> #include <linux/zio.h>
#include "field-desc.h" #include "field-desc.h"
#define FA_GATEWARE_DEFAULT_NAME "fmc/spec-fmc-adc-v1.1.bin" #define FA_GATEWARE_DEFAULT_NAME "fmc/adc-100m14b.bin"
extern int enable_auto_start; extern int enable_auto_start;
/* ADC register offset */ /* ADC register offset */
......
lib/fmcadc-lib-zio.c
View file @ 0db88006
...@@ -670,7 +670,7 @@ struct fmcadc_op fa_100ms_4ch_14bit_op = { ...@@ -670,7 +670,7 @@ struct fmcadc_op fa_100ms_4ch_14bit_op = {
}; };
struct fmcadc_board_type fmcadc_100ms_4ch_14bit = { struct fmcadc_board_type fmcadc_100ms_4ch_14bit = {
.name = "fmcadc_100MS_4ch_14bit", .name = "fmcadc_100MS_4ch_14bit",
.devname = "fmc-adc", .devname = "adc-100m14b",
.driver_type = "zio", .driver_type = "zio",
.capabilities = { .capabilities = {
FMCADC_ZIO_TRG_MASK, FMCADC_ZIO_TRG_MASK,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment