Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit 2a258a4d authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

kernel: remove trigger delay compensation 

In gateware v5 all the necessary compensations are done in FPGA
Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 1fc6458e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 30 deletions
kernel/fa-core.c
View file @ 2a258a4d
......@@ -416,7 +416,6 @@ static int __fa_init(struct fa_dev *fa)
fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[ZFAT_CFG_HW_SEL],
1);
zdev->cset->ti->zattr_set.ext_zattr[FA100M14B4C_TATTR_EXT].value = 1;
fa->trig_compensation = FA_CH_TX_DELAY;
} else {
/* Enable Software trigger*/
fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[ZFAT_CFG_SW_EN],
......@@ -424,8 +423,6 @@ static int __fa_init(struct fa_dev *fa)
/* Disable Hardware trigger*/
fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[ZFAT_CFG_HW_EN],
0);
/* Set default trigger delay */
fa->trig_compensation = 0;
}
/* Zero offsets and release the DAC clear */
......@@ -439,12 +436,7 @@ static int __fa_init(struct fa_dev *fa)
fa_writel(fa, fa->fa_utc_base, &zfad_regs[ZFA_UTC_SECONDS],
get_seconds());
/*
* Set Trigger delay in order to compensate
* the channel signal transmission delay
*/
fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[ZFAT_DLY],
fa->trig_compensation);
fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[ZFAT_DLY], 0);
/* disable auto_start */
fa->enable_auto_start = 0;
......
kernel/fa-zio-trg.c
View file @ 2a258a4d
......@@ -90,7 +90,7 @@ static int zfat_conf_set(struct device *dev, struct zio_attribute *zattr,
{
struct fa_dev *fa = get_zfadc(dev);
struct zio_ti *ti = to_zio_ti(dev);
uint32_t tmp_val = usr_val, delay;
uint32_t tmp_val = usr_val;
switch (zattr->id) {
case ZFAT_SHOTS_NB:
......@@ -123,20 +123,6 @@ static int zfat_conf_set(struct device *dev, struct zio_attribute *zattr,
* acquisition or other problems:
*/
break;
case ZFAT_DLY:
/* Add channel signal transmission delay */
tmp_val += fa->trig_compensation;
break;
case ZFAT_CFG_HW_SEL:
/* Remove old compensation value */
delay = fa_readl(fa, fa->fa_adc_csr_base, &zfad_regs[ZFAT_DLY]);
delay -= fa->trig_compensation;
/* Calculate and apply new compensation */
fa->trig_compensation = tmp_val ? FA_CH_TX_DELAY : 0;
delay += fa->trig_compensation;
fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[ZFAT_DLY], delay);
break;
}
fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[zattr->id], tmp_val);
......@@ -158,10 +144,6 @@ static int zfat_info_get(struct device *dev, struct zio_attribute *zattr,
case ZFAT_POST:
(*usr_val)++; /* add the trigger sample */
break;
case ZFAT_DLY:
/* Add channel signal transmission delay */
*usr_val -= fa->trig_compensation;
break;
}
return 0;
......
kernel/fmc-adc-100m14b4cha.h
View file @ 2a258a4d
......@@ -372,8 +372,6 @@ struct fa_dev {
/* flag */
int enable_auto_start;
uint32_t trig_compensation;
struct dentry *reg_dump;
};
......
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