Commit 7500faf0 authored by Federico Vaga's avatar Federico Vaga

core rename fmc_adc to fa_dev

Signed-off-by: 's avatarFederico Vaga <federico.vaga@gmail.com>
parent 02c60878
...@@ -13,15 +13,15 @@ ...@@ -13,15 +13,15 @@
#include "spec.h" #include "spec.h"
#include "fmc-adc.h" #include "fmc-adc.h"
static struct fmc_driver fmc_adc__drv; static struct fmc_driver fa_dev__drv;
static char *fa_binaries = FA_GATEWARE_DEFAULT_NAME; static char *fa_binaries = FA_GATEWARE_DEFAULT_NAME;
module_param_named(file, fa_binaries, charp, 0444); module_param_named(file, fa_binaries, charp, 0444);
/* This structure lists the various subsystems */ /* This structure lists the various subsystems */
struct fa_modlist { struct fa_modlist {
char *name; char *name;
int (*init)(struct fmc_adc *); int (*init)(struct fa_dev *);
void (*exit)(struct fmc_adc *); void (*exit)(struct fa_dev *);
}; };
#define SUBSYS(x) { #x, fa_ ## x ## _init, fa_ ## x ## _exit } #define SUBSYS(x) { #x, fa_ ## x ## _init, fa_ ## x ## _exit }
static struct fa_modlist mods[] = { static struct fa_modlist mods[] = {
...@@ -33,7 +33,7 @@ static struct fa_modlist mods[] = { ...@@ -33,7 +33,7 @@ static struct fa_modlist mods[] = {
int fa_probe(struct fmc_device *fmc) int fa_probe(struct fmc_device *fmc)
{ {
struct fa_modlist *m = NULL; struct fa_modlist *m = NULL;
struct fmc_adc *fa; struct fa_dev *fa;
struct spec_dev *spec = fmc->carrier_data; struct spec_dev *spec = fmc->carrier_data;
int err, i = 0; int err, i = 0;
...@@ -43,7 +43,7 @@ int fa_probe(struct fmc_device *fmc) ...@@ -43,7 +43,7 @@ int fa_probe(struct fmc_device *fmc)
} }
pr_info("%s:%d\n", __func__, __LINE__); pr_info("%s:%d\n", __func__, __LINE__);
/* Driver data */ /* Driver data */
fa = devm_kzalloc(&fmc->dev, sizeof(struct fmc_adc), GFP_KERNEL); fa = devm_kzalloc(&fmc->dev, sizeof(struct fa_dev), GFP_KERNEL);
if (!fa) if (!fa)
return -ENOMEM; return -ENOMEM;
fmc_set_drvdata(fmc, fa); fmc_set_drvdata(fmc, fa);
...@@ -52,7 +52,7 @@ int fa_probe(struct fmc_device *fmc) ...@@ -52,7 +52,7 @@ int fa_probe(struct fmc_device *fmc)
fa->base = spec->remap[0]; fa->base = spec->remap[0];
/* We first write a new binary (and lm32) within the spec */ /* We first write a new binary (and lm32) within the spec */
err = fmc->op->reprogram(fmc, &fmc_adc__drv, fa_binaries); err = fmc->op->reprogram(fmc, &fa_dev__drv, fa_binaries);
if (err) { if (err) {
dev_err(fmc->hwdev, "write firmware \"%s\": error %i\n", dev_err(fmc->hwdev, "write firmware \"%s\": error %i\n",
fa_binaries, err); fa_binaries, err);
...@@ -80,13 +80,13 @@ out: ...@@ -80,13 +80,13 @@ out:
} }
int fa_remove(struct fmc_device *fmc) int fa_remove(struct fmc_device *fmc)
{ {
struct fmc_adc *fa = fmc_get_drvdata(fmc); struct fa_dev *fa = fmc_get_drvdata(fmc);
fa_zio_exit(fa); fa_zio_exit(fa);
devm_kfree(&fmc->dev, fa); devm_kfree(&fmc->dev, fa);
return 0; return 0;
} }
static struct fmc_driver fmc_adc__drv = { static struct fmc_driver fa_dev__drv = {
.driver.name = KBUILD_MODNAME, .driver.name = KBUILD_MODNAME,
.probe = fa_probe, .probe = fa_probe,
.remove = fa_remove, .remove = fa_remove,
...@@ -98,13 +98,13 @@ static int fa_init(void) ...@@ -98,13 +98,13 @@ static int fa_init(void)
int ret; int ret;
pr_debug("%s\n",__func__); pr_debug("%s\n",__func__);
ret = fmc_driver_register(&fmc_adc__drv); ret = fmc_driver_register(&fa_dev__drv);
if (ret) if (ret)
return ret; return ret;
ret = fa_zio_register(); ret = fa_zio_register();
if (ret) { if (ret) {
fmc_driver_unregister(&fmc_adc__drv); fmc_driver_unregister(&fa_dev__drv);
return ret; return ret;
} }
return 0; return 0;
...@@ -113,7 +113,7 @@ static int fa_init(void) ...@@ -113,7 +113,7 @@ static int fa_init(void)
static void fa_exit(void) static void fa_exit(void)
{ {
fa_zio_unregister(); fa_zio_unregister();
fmc_driver_unregister(&fmc_adc__drv); fmc_driver_unregister(&fa_dev__drv);
} }
module_init(fa_init); module_init(fa_init);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "fmc-adc.h" #include "fmc-adc.h"
/* Initialize each element of the scatter list */ /* Initialize each element of the scatter list */
static void zfad_setup_dma_scatter(struct fmc_adc *fa, struct zio_block *block) static void zfad_setup_dma_scatter(struct fa_dev *fa, struct zio_block *block)
{ {
struct scatterlist *sg; struct scatterlist *sg;
int bytesleft = block->datalen; int bytesleft = block->datalen;
...@@ -61,7 +61,7 @@ static void zfad_setup_dma_scatter(struct fmc_adc *fa, struct zio_block *block) ...@@ -61,7 +61,7 @@ static void zfad_setup_dma_scatter(struct fmc_adc *fa, struct zio_block *block)
*/ */
int zfad_map_dma(struct zio_cset *cset) int zfad_map_dma(struct zio_cset *cset)
{ {
struct fmc_adc *fa = cset->zdev->priv_d; struct fa_dev *fa = cset->zdev->priv_d;
struct scatterlist *sg; struct scatterlist *sg;
struct zio_block *block = cset->interleave->active_block; struct zio_block *block = cset->interleave->active_block;
struct dma_item *items; struct dma_item *items;
...@@ -170,7 +170,7 @@ out: ...@@ -170,7 +170,7 @@ out:
*/ */
void zfad_unmap_dma(struct zio_cset *cset) void zfad_unmap_dma(struct zio_cset *cset)
{ {
struct fmc_adc *fa = cset->zdev->priv_d; struct fa_dev *fa = cset->zdev->priv_d;
unsigned int size; unsigned int size;
dev_dbg(fa->fmc->hwdev, "unmap DMA\n"); dev_dbg(fa->fmc->hwdev, "unmap DMA\n");
......
...@@ -291,7 +291,7 @@ static int zfad_input_cset(struct zio_cset *cset) ...@@ -291,7 +291,7 @@ static int zfad_input_cset(struct zio_cset *cset)
static int zfad_zio_probe(struct zio_device *zdev) static int zfad_zio_probe(struct zio_device *zdev)
{ {
struct fmc_adc *fa = zdev->priv_d; struct fa_dev *fa = zdev->priv_d;
dev_dbg(&zdev->head.dev, "%s:%d", __func__, __LINE__); dev_dbg(&zdev->head.dev, "%s:%d", __func__, __LINE__);
/* Save also the pointer to the real zio_device */ /* Save also the pointer to the real zio_device */
...@@ -409,7 +409,7 @@ void fa_zio_unregister(void) ...@@ -409,7 +409,7 @@ void fa_zio_unregister(void)
/* Init and exit are called for each FMC-ADC card we have */ /* Init and exit are called for each FMC-ADC card we have */
int fa_zio_init(struct fmc_adc *fa) int fa_zio_init(struct fa_dev *fa)
{ {
struct device *hwdev = fa->fmc->hwdev; struct device *hwdev = fa->fmc->hwdev;
struct spec_dev *spec = fa->fmc->carrier_data; struct spec_dev *spec = fa->fmc->carrier_data;
...@@ -463,7 +463,7 @@ out_trg: ...@@ -463,7 +463,7 @@ out_trg:
return err; return err;
} }
void fa_zio_exit(struct fmc_adc *fa) void fa_zio_exit(struct fa_dev *fa)
{ {
zio_unregister_device(fa->hwzdev); zio_unregister_device(fa->hwzdev);
zio_free_device(fa->hwzdev); zio_free_device(fa->hwzdev);
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
struct zfat_instance { struct zfat_instance {
struct zio_ti ti; struct zio_ti ti;
struct fmc_adc *fa; struct fa_dev *fa;
unsigned int n_acq_dev; /* number of acquisitions on device memory */ unsigned int n_acq_dev; /* number of acquisitions on device memory */
unsigned int n_err; /* number of errors */ unsigned int n_err; /* number of errors */
...@@ -173,7 +173,7 @@ static const struct zio_sysfs_operations zfat_s_op = { ...@@ -173,7 +173,7 @@ static const struct zio_sysfs_operations zfat_s_op = {
static void zfat_start_next_dma(struct zio_ti *ti) static void zfat_start_next_dma(struct zio_ti *ti)
{ {
struct zfat_instance *zfat = to_zfat_instance(ti); struct zfat_instance *zfat = to_zfat_instance(ti);
struct fmc_adc *fa = ti->cset->zdev->priv_d; struct fa_dev *fa = ti->cset->zdev->priv_d;
struct zio_channel *interleave = ti->cset->interleave; struct zio_channel *interleave = ti->cset->interleave;
struct zfat_block *zfat_block; struct zfat_block *zfat_block;
struct zio_buffer_type *zbuf = ti->cset->zbuf; struct zio_buffer_type *zbuf = ti->cset->zbuf;
...@@ -291,7 +291,7 @@ static void zfat_irq_trg_fire(struct zfat_instance *zfat) ...@@ -291,7 +291,7 @@ static void zfat_irq_trg_fire(struct zfat_instance *zfat)
struct zio_ti *ti = &zfat->ti; struct zio_ti *ti = &zfat->ti;
struct zio_channel *interleave = ti->cset->interleave; struct zio_channel *interleave = ti->cset->interleave;
struct zio_buffer_type *zbuf = ti->cset->zbuf; struct zio_buffer_type *zbuf = ti->cset->zbuf;
struct fmc_adc *fa = ti->cset->zdev->priv_d; struct fa_dev *fa = ti->cset->zdev->priv_d;
struct zio_control *ctrl; struct zio_control *ctrl;
struct zio_block *block; struct zio_block *block;
struct zfat_block *zfat_block; struct zfat_block *zfat_block;
...@@ -396,7 +396,7 @@ static void zfat_irq_acq_end(struct zfat_instance *zfat) ...@@ -396,7 +396,7 @@ static void zfat_irq_acq_end(struct zfat_instance *zfat)
static irqreturn_t zfadc_irq(int irq, void *ptr) static irqreturn_t zfadc_irq(int irq, void *ptr)
{ {
struct fmc_device *fmc = ptr; struct fmc_device *fmc = ptr;
struct fmc_adc *fa = fmc_get_drvdata(fmc); struct fa_dev *fa = fmc_get_drvdata(fmc);
struct zfat_instance *zfat = to_zfat_instance(fa->zdev->cset->ti); struct zfat_instance *zfat = to_zfat_instance(fa->zdev->cset->ti);
uint32_t status; uint32_t status;
...@@ -418,7 +418,7 @@ static struct zio_ti *zfat_create(struct zio_trigger_type *trig, ...@@ -418,7 +418,7 @@ static struct zio_ti *zfat_create(struct zio_trigger_type *trig,
struct zio_cset *cset, struct zio_cset *cset,
struct zio_control *ctrl, fmode_t flags) struct zio_control *ctrl, fmode_t flags)
{ {
struct fmc_adc *fa = cset->zdev->priv_d; struct fa_dev *fa = cset->zdev->priv_d;
struct zfat_instance *zfat; struct zfat_instance *zfat;
int err; int err;
...@@ -447,7 +447,7 @@ static struct zio_ti *zfat_create(struct zio_trigger_type *trig, ...@@ -447,7 +447,7 @@ static struct zio_ti *zfat_create(struct zio_trigger_type *trig,
} }
static void zfat_destroy(struct zio_ti *ti) static void zfat_destroy(struct zio_ti *ti)
{ {
struct fmc_adc *fa = ti->cset->zdev->priv_d; struct fa_dev *fa = ti->cset->zdev->priv_d;
struct zfat_instance *zfat = to_zfat_instance(ti); struct zfat_instance *zfat = to_zfat_instance(ti);
/* Disable all interrupt */ /* Disable all interrupt */
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* Driver for the mezzanine ADC for the SPEC * Driver for the mezzanine ADC for the SPEC
*/ */
#ifndef _FMC_ADC_H_ #ifndef _fa_dev_H_
#define _FMC_ADC_H_ #define _fa_dev_H_
#include <linux/zio.h> #include <linux/zio.h>
#include "spec.h" #include "spec.h"
...@@ -38,7 +38,7 @@ struct dma_item { ...@@ -38,7 +38,7 @@ struct dma_item {
}; };
/* /*
* fmc_adc: is the descriptor of the FMC ADC mezzanine * fa_dev: is the descriptor of the FMC ADC mezzanine
* *
* @fmc: the pointer to the fmc_device generic structure * @fmc: the pointer to the fmc_device generic structure
* @spec: this driver depends on spec (FIXME no svec at the moment) * @spec: this driver depends on spec (FIXME no svec at the moment)
...@@ -59,7 +59,7 @@ struct dma_item { ...@@ -59,7 +59,7 @@ struct dma_item {
* transfer * transfer
* @base: the base address for to access device registers (BAR0) * @base: the base address for to access device registers (BAR0)
*/ */
struct fmc_adc { struct fa_dev {
struct fmc_device *fmc; struct fmc_device *fmc;
struct spec_dev *spec; struct spec_dev *spec;
struct zio_device *zdev; struct zio_device *zdev;
...@@ -229,7 +229,7 @@ enum zfat_irq { ...@@ -229,7 +229,7 @@ enum zfat_irq {
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
static inline struct fmc_adc *get_zfadc(struct device *dev) static inline struct fa_dev *get_zfadc(struct device *dev)
{ {
switch (to_zio_head(dev)->zobj_type) { switch (to_zio_head(dev)->zobj_type) {
case ZDEV: case ZDEV:
...@@ -251,12 +251,12 @@ static inline struct spec_dev *get_spec(struct device *dev) ...@@ -251,12 +251,12 @@ static inline struct spec_dev *get_spec(struct device *dev)
return get_zfadc(dev)->spec; return get_zfadc(dev)->spec;
} }
/* FIXME convert fa_{read|write}_reg to fmc_{writel|readl} when fmc is fixed */ /* FIXME convert fa_{read|write}_reg to fmc_{writel|readl} when fmc is fixed */
static inline uint32_t fa_read_reg(struct fmc_adc *fa, static inline uint32_t fa_read_reg(struct fa_dev *fa,
const struct zio_reg_desc *reg) const struct zio_reg_desc *reg)
{ {
return readl(fa->base + reg->addr); return readl(fa->base + reg->addr);
} }
static inline void fa_write_reg(uint32_t val, struct fmc_adc *fa, static inline void fa_write_reg(uint32_t val, struct fa_dev *fa,
const struct zio_reg_desc *reg) const struct zio_reg_desc *reg)
{ {
writel(val, fa->base + reg->addr); writel(val, fa->base + reg->addr);
...@@ -307,15 +307,15 @@ extern const struct zio_reg_desc zfad_regs[]; ...@@ -307,15 +307,15 @@ extern const struct zio_reg_desc zfad_regs[];
/* Functions exported by fa-zio.c */ /* Functions exported by fa-zio.c */
extern int fa_zio_register(void); extern int fa_zio_register(void);
extern void fa_zio_unregister(void); extern void fa_zio_unregister(void);
extern int fa_zio_init(struct fmc_adc *fa); extern int fa_zio_init(struct fa_dev *fa);
extern void fa_zio_exit(struct fmc_adc *fa); extern void fa_zio_exit(struct fa_dev *fa);
/* Functions exported by fa-spec.c */ /* Functions exported by fa-spec.c */
extern int fa_spec_init(void); extern int fa_spec_init(void);
extern void fa_spec_exit(void); extern void fa_spec_exit(void);
/* Functions exported by onewire.c */ /* Functions exported by onewire.c */
extern int fa_onewire_init(struct fmc_adc *fa); extern int fa_onewire_init(struct fa_dev *fa);
extern void fa_onewire_exit(struct fmc_adc *fa); extern void fa_onewire_exit(struct fa_dev *fa);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _FMC_ADC_H_ */ #endif /* _fa_dev_H_ */
...@@ -53,17 +53,17 @@ ...@@ -53,17 +53,17 @@
#define FD_OW_PORT 0 /* what is this slow? */ #define FD_OW_PORT 0 /* what is this slow? */
static void ow_writel(struct fmc_adc *fa, uint32_t val, unsigned long reg) static void ow_writel(struct fa_dev *fa, uint32_t val, unsigned long reg)
{ {
writel(val, fa->base + FA_OWI_MEM_OFF + reg); writel(val, fa->base + FA_OWI_MEM_OFF + reg);
} }
static uint32_t ow_readl(struct fmc_adc *fa, unsigned long reg) static uint32_t ow_readl(struct fa_dev *fa, unsigned long reg)
{ {
return readl(fa->base + FA_OWI_MEM_OFF + reg); return readl(fa->base + FA_OWI_MEM_OFF + reg);
} }
static int ow_reset(struct fmc_adc *fa, int port) static int ow_reset(struct fa_dev *fa, int port)
{ {
uint32_t reg, data; uint32_t reg, data;
...@@ -76,7 +76,7 @@ static int ow_reset(struct fmc_adc *fa, int port) ...@@ -76,7 +76,7 @@ static int ow_reset(struct fmc_adc *fa, int port)
return ~reg & CSR_DAT_MSK; return ~reg & CSR_DAT_MSK;
} }
static int slot(struct fmc_adc *fa, int port, int bit) static int slot(struct fa_dev *fa, int port, int bit)
{ {
uint32_t reg, data; uint32_t reg, data;
...@@ -89,17 +89,17 @@ static int slot(struct fmc_adc *fa, int port, int bit) ...@@ -89,17 +89,17 @@ static int slot(struct fmc_adc *fa, int port, int bit)
return reg & CSR_DAT_MSK; return reg & CSR_DAT_MSK;
} }
static int read_bit(struct fmc_adc *fa, int port) static int read_bit(struct fa_dev *fa, int port)
{ {
return slot(fa, port, 0x1); return slot(fa, port, 0x1);
} }
static int write_bit(struct fmc_adc *fa, int port, int bit) static int write_bit(struct fa_dev *fa, int port, int bit)
{ {
return slot(fa, port, bit); return slot(fa, port, bit);
} }
static int ow_read_byte(struct fmc_adc *fa, int port) static int ow_read_byte(struct fa_dev *fa, int port)
{ {
int byte = 0, i; int byte = 0, i;
...@@ -108,7 +108,7 @@ static int ow_read_byte(struct fmc_adc *fa, int port) ...@@ -108,7 +108,7 @@ static int ow_read_byte(struct fmc_adc *fa, int port)
return byte; return byte;
} }
static int ow_write_byte(struct fmc_adc *fa, int port, int byte) static int ow_write_byte(struct fa_dev *fa, int port, int byte)
{ {
int data = 0; int data = 0;
int i; int i;
...@@ -120,7 +120,7 @@ static int ow_write_byte(struct fmc_adc *fa, int port, int byte) ...@@ -120,7 +120,7 @@ static int ow_write_byte(struct fmc_adc *fa, int port, int byte)
return 0; /* success */ return 0; /* success */
} }
static int ow_write_block(struct fmc_adc *fa, int port, uint8_t *block, int len) static int ow_write_block(struct fa_dev *fa, int port, uint8_t *block, int len)
{ {
int i; int i;
...@@ -129,7 +129,7 @@ static int ow_write_block(struct fmc_adc *fa, int port, uint8_t *block, int len) ...@@ -129,7 +129,7 @@ static int ow_write_block(struct fmc_adc *fa, int port, uint8_t *block, int len)
return 0; return 0;
} }
static int ow_read_block(struct fmc_adc *fa, int port, uint8_t *block, int len) static int ow_read_block(struct fa_dev *fa, int port, uint8_t *block, int len)
{ {
int i; int i;
for(i = 0; i < len; i++) for(i = 0; i < len; i++)
...@@ -137,7 +137,7 @@ static int ow_read_block(struct fmc_adc *fa, int port, uint8_t *block, int len) ...@@ -137,7 +137,7 @@ static int ow_read_block(struct fmc_adc *fa, int port, uint8_t *block, int len)
return 0; return 0;
} }
static int ds18x_read_serial(struct fmc_adc *fa) static int ds18x_read_serial(struct fa_dev *fa)
{ {
if(!ow_reset(fa, 0)) { if(!ow_reset(fa, 0)) {
pr_err("%s: Failure in resetting one-wire channel\n", pr_err("%s: Failure in resetting one-wire channel\n",
...@@ -149,7 +149,7 @@ static int ds18x_read_serial(struct fmc_adc *fa) ...@@ -149,7 +149,7 @@ static int ds18x_read_serial(struct fmc_adc *fa)
return ow_read_block(fa, FD_OW_PORT, fa->ds18_id, 8); return ow_read_block(fa, FD_OW_PORT, fa->ds18_id, 8);
} }
static int ds18x_access(struct fmc_adc *fa) static int ds18x_access(struct fa_dev *fa)
{ {
if(!ow_reset(fa, 0)) if(!ow_reset(fa, 0))
goto out; goto out;
...@@ -168,7 +168,7 @@ out: ...@@ -168,7 +168,7 @@ out:
return -EIO; return -EIO;
} }
static void __temp_command_and_next_t(struct fmc_adc *fa, int cfg_reg) static void __temp_command_and_next_t(struct fa_dev *fa, int cfg_reg)
{ {
int ms; int ms;
...@@ -179,7 +179,7 @@ static void __temp_command_and_next_t(struct fmc_adc *fa, int cfg_reg) ...@@ -179,7 +179,7 @@ static void __temp_command_and_next_t(struct fmc_adc *fa, int cfg_reg)
fa->next_t = jiffies + msecs_to_jiffies(ms); fa->next_t = jiffies + msecs_to_jiffies(ms);
} }
int fa_read_temp(struct fmc_adc *fa, int verbose) int fa_read_temp(struct fa_dev *fa, int verbose)
{ {
int i, temp; int i, temp;
unsigned long j; unsigned long j;
...@@ -221,7 +221,7 @@ int fa_read_temp(struct fmc_adc *fa, int verbose) ...@@ -221,7 +221,7 @@ int fa_read_temp(struct fmc_adc *fa, int verbose)
return temp; return temp;
} }
int fa_onewire_init(struct fmc_adc *fa) int fa_onewire_init(struct fa_dev *fa)
{ {
ow_writel(fa, ((CLK_DIV_NOR & CDR_NOR_MSK) ow_writel(fa, ((CLK_DIV_NOR & CDR_NOR_MSK)
| (( CLK_DIV_OVD << CDR_OVD_OFS) & CDR_OVD_MSK)), | (( CLK_DIV_OVD << CDR_OVD_OFS) & CDR_OVD_MSK)),
...@@ -236,7 +236,7 @@ int fa_onewire_init(struct fmc_adc *fa) ...@@ -236,7 +236,7 @@ int fa_onewire_init(struct fmc_adc *fa)
return 0; return 0;
} }
void fa_onewire_exit(struct fmc_adc *fa) void fa_onewire_exit(struct fa_dev *fa)
{ {
/* Nothing to do */ /* Nothing to do */
} }
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