Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC ADC 100M 14b 4cha
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
FMC ADC 100M 14b 4cha
Commits
1fc6458e
Commit
1fc6458e
authored
Feb 07, 2018
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel: rename decimation -> undersample
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
d18cd552
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
fa-core.c
kernel/fa-core.c
+1
-1
fa-regtable.c
kernel/fa-regtable.c
+1
-1
fa-zio-drv.c
kernel/fa-zio-drv.c
+2
-2
fmc-adc-100m14b4cha.h
kernel/fmc-adc-100m14b4cha.h
+1
-1
No files found.
kernel/fa-core.c
View file @
1fc6458e
...
...
@@ -404,7 +404,7 @@ static int __fa_init(struct fa_dev *fa)
/* Enable mezzanine clock */
fa_writel
(
fa
,
fa
->
fa_adc_csr_base
,
&
zfad_regs
[
ZFA_CTL_CLK_EN
],
1
);
/* Set decimation to minimum */
fa_writel
(
fa
,
fa
->
fa_adc_csr_base
,
&
zfad_regs
[
ZFAT_SR_
DECI
],
1
);
fa_writel
(
fa
,
fa
->
fa_adc_csr_base
,
&
zfad_regs
[
ZFAT_SR_
UNDER
],
1
);
/* Set test data register */
fa_writel
(
fa
,
fa
->
fa_adc_csr_base
,
&
zfad_regs
[
ZFA_CTL_TEST_DATA_EN
],
fa_enable_test_data_fpga
);
...
...
kernel/fa-regtable.c
View file @
1fc6458e
...
...
@@ -40,7 +40,7 @@ const struct zfa_field_desc zfad_regs[] = {
/* Sampling clock frequency */
[
ZFAT_SAMPLING_HZ
]
=
{
0x20
,
0xFFFFFFFF
,
0
},
/* Sample rate */
[
ZFAT_SR_
DECI
]
=
{
0x24
,
0xFFFFFFFF
,
0
},
[
ZFAT_SR_
UNDER
]
=
{
0x24
,
0xFFFFFFFF
,
0
},
/* Position address */
[
ZFAT_POS
]
=
{
0x1C
,
0xFFFFFFFF
,
0
},
/* Pre-sample */
...
...
kernel/fa-zio-drv.c
View file @
1fc6458e
...
...
@@ -41,7 +41,7 @@ static struct zio_attribute zfad_cset_ext_zattr[] = {
* acquisition you can decimate samples. 0 is a forbidden value, 1
* for the maximum speed.
*/
ZIO_ATTR_EXT
(
"
sample-decimation"
,
ZIO_RW_PERM
,
ZFAT_SR_DECI
,
1
),
ZIO_ATTR_EXT
(
"
undersample"
,
ZIO_RW_PERM
,
ZFAT_SR_UNDER
,
1
),
ZIO_ATTR_EXT
(
"ch0-offset"
,
ZIO_RW_PERM
,
ZFA_CH1_OFFSET
,
0
),
ZIO_ATTR_EXT
(
"ch1-offset"
,
ZIO_RW_PERM
,
ZFA_CH2_OFFSET
,
0
),
...
...
@@ -227,7 +227,7 @@ static int zfad_conf_set(struct device *dev, struct zio_attribute *zattr,
case
ZFA_CTL_DAC_CLR_N
:
zfad_reset_offset
(
fa
);
return
0
;
case
ZFAT_SR_
DECI
:
case
ZFAT_SR_
UNDER
:
if
(
usr_val
==
0
)
usr_val
++
;
break
;
...
...
kernel/fmc-adc-100m14b4cha.h
View file @
1fc6458e
...
...
@@ -149,7 +149,7 @@ enum zfadc_dregs_enum {
/* Remaining shots counter */
ZFAT_SHOTS_REM
,
/* Sample rate */
ZFAT_SR_
DECI
,
ZFAT_SR_
UNDER
,
/* Sampling clock frequency */
ZFAT_SAMPLING_HZ
,
/* Position address */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment