Skip to content

Commit ce44e94

Browse files
caosjrcaosjr
committed
projects: updated NUM_OF_SDI parameter to NUM_OF_SDIO
Updated the projects to use NUM_OF_SDIO parameter. It is the same project, no functionality has changed. Signed-off-by: Carlos Souza <[email protected]>
1 parent 972bd97 commit ce44e94

File tree

28 files changed

+98
-97
lines changed

28 files changed

+98
-97
lines changed

‎projects/ad4052_ardz/common/ad4052_qsys.tcl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@ add_instance axi_spi_engine_0 axi_spi_engine
1717
set_instance_parameter_value axi_spi_engine_0 {ASYNC_SPI_CLK} {1}
1818
set_instance_parameter_value axi_spi_engine_0 {DATA_WIDTH} {32}
1919
set_instance_parameter_value axi_spi_engine_0 {MM_IF_TYPE} {0}
20-
set_instance_parameter_value axi_spi_engine_0 {NUM_OF_SDI} {1}
20+
set_instance_parameter_value axi_spi_engine_0 {NUM_OF_SDIO} {1}
2121
set_instance_parameter_value axi_spi_engine_0 {NUM_OFFLOAD} {1}
2222

2323
# spi_engine_execution
2424

2525
add_instance spi_engine_execution_0 spi_engine_execution
2626
set_instance_parameter_value spi_engine_execution_0 {DATA_WIDTH} {32}
27-
set_instance_parameter_value spi_engine_execution_0 {NUM_OF_SDI} {1}
27+
set_instance_parameter_value spi_engine_execution_0 {NUM_OF_SDIO} {1}
2828
set_instance_parameter_value spi_engine_execution_0 {SDI_DELAY} {0}
2929

3030
# spi_engine_interconnect
3131

3232
add_instance spi_engine_interconnect_0 spi_engine_interconnect
3333
set_instance_parameter_value spi_engine_interconnect_0 {DATA_WIDTH} {32}
34-
set_instance_parameter_value spi_engine_interconnect_0 {NUM_OF_SDI} {1}
34+
set_instance_parameter_value spi_engine_interconnect_0 {NUM_OF_SDIO} {1}
3535

3636
# spi_engine_offload
3737

3838
add_instance spi_engine_offload_0 spi_engine_offload
3939
set_instance_parameter_value spi_engine_offload_0 {ASYNC_TRIG} {1}
4040
set_instance_parameter_value spi_engine_offload_0 {ASYNC_SPI_CLK} {0}
4141
set_instance_parameter_value spi_engine_offload_0 {DATA_WIDTH} {32}
42-
set_instance_parameter_value spi_engine_offload_0 {NUM_OF_SDI} {1}
42+
set_instance_parameter_value spi_engine_offload_0 {NUM_OF_SDIO} {1}
4343

4444
# axi_pwm_gen
4545

‎projects/ad411x_ad717x/common/ad411x_ad717x_asdz_qsys.tcl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,29 @@ add_instance axi_spi_engine_0 axi_spi_engine
1818
set_instance_parameter_value axi_spi_engine_0 {ASYNC_SPI_CLK} {1}
1919
set_instance_parameter_value axi_spi_engine_0 {DATA_WIDTH} {32}
2020
set_instance_parameter_value axi_spi_engine_0 {MM_IF_TYPE} {0}
21-
set_instance_parameter_value axi_spi_engine_0 {NUM_OF_SDI} {1}
21+
set_instance_parameter_value axi_spi_engine_0 {NUM_OF_SDIO} {1}
2222
set_instance_parameter_value axi_spi_engine_0 {NUM_OFFLOAD} {1}
2323

2424
# spi_engine_execution
2525

2626
add_instance spi_engine_execution_0 spi_engine_execution
2727
set_instance_parameter_value spi_engine_execution_0 {DATA_WIDTH} {32}
28-
set_instance_parameter_value spi_engine_execution_0 {NUM_OF_SDI} {1}
28+
set_instance_parameter_value spi_engine_execution_0 {NUM_OF_SDIO} {1}
2929
set_instance_parameter_value spi_engine_execution_0 {SDI_DELAY} {0}
3030

3131
# spi_engine_interconnect
3232

3333
add_instance spi_engine_interconnect_0 spi_engine_interconnect
3434
set_instance_parameter_value spi_engine_interconnect_0 {DATA_WIDTH} {32}
35-
set_instance_parameter_value spi_engine_interconnect_0 {NUM_OF_SDI} {1}
35+
set_instance_parameter_value spi_engine_interconnect_0 {NUM_OF_SDIO} {1}
3636

3737
# spi_engine_offload
3838

3939
add_instance spi_engine_offload_0 spi_engine_offload
4040
set_instance_parameter_value spi_engine_offload_0 {ASYNC_TRIG} {1}
4141
set_instance_parameter_value spi_engine_offload_0 {ASYNC_SPI_CLK} {0}
4242
set_instance_parameter_value spi_engine_offload_0 {DATA_WIDTH} {32}
43-
set_instance_parameter_value spi_engine_offload_0 {NUM_OF_SDI} {1}
43+
set_instance_parameter_value spi_engine_offload_0 {NUM_OF_SDIO} {1}
4444

4545
# util_sigma_delta_spi
4646

‎projects/ad4170_asdz/common/ad4170_asdz_qsys.tcl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ add_instance axi_spi_engine_0 axi_spi_engine
1919
set_instance_parameter_value axi_spi_engine_0 {ASYNC_SPI_CLK} {1}
2020
set_instance_parameter_value axi_spi_engine_0 {DATA_WIDTH} {32}
2121
set_instance_parameter_value axi_spi_engine_0 {MM_IF_TYPE} {0}
22-
set_instance_parameter_value axi_spi_engine_0 {NUM_OF_SDI} {1}
22+
set_instance_parameter_value axi_spi_engine_0 {NUM_OF_SDIO} {1}
2323
set_instance_parameter_value axi_spi_engine_0 {NUM_OFFLOAD} {1}
2424

2525
# spi_engine_execution
2626

2727
add_instance spi_engine_execution_0 spi_engine_execution
2828
set_instance_parameter_value spi_engine_execution_0 {DATA_WIDTH} {32}
29-
set_instance_parameter_value spi_engine_execution_0 {NUM_OF_SDI} {1}
29+
set_instance_parameter_value spi_engine_execution_0 {NUM_OF_SDIO} {1}
3030
set_instance_parameter_value spi_engine_execution_0 {SDI_DELAY} {0}
3131

3232
# spi_engine_interconnect
3333

3434
add_instance spi_engine_interconnect_0 spi_engine_interconnect
3535
set_instance_parameter_value spi_engine_interconnect_0 {DATA_WIDTH} {32}
36-
set_instance_parameter_value spi_engine_interconnect_0 {NUM_OF_SDI} {1}
36+
set_instance_parameter_value spi_engine_interconnect_0 {NUM_OF_SDIO} {1}
3737

3838
# bridges
3939

@@ -53,7 +53,7 @@ add_instance spi_engine_offload_0 spi_engine_offload
5353
set_instance_parameter_value spi_engine_offload_0 {ASYNC_TRIG} {1}
5454
set_instance_parameter_value spi_engine_offload_0 {ASYNC_SPI_CLK} {0}
5555
set_instance_parameter_value spi_engine_offload_0 {DATA_WIDTH} {32}
56-
set_instance_parameter_value spi_engine_offload_0 {NUM_OF_SDI} {1}
56+
set_instance_parameter_value spi_engine_offload_0 {NUM_OF_SDIO} {1}
5757

5858
# exported interface
5959

‎projects/ad4630_fmc/common/ad463x_bd.tcl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
source $ad_hdl_dir/library/spi_engine/scripts/spi_engine.tcl
77
# system level parameters
8-
set NUM_OF_SDI $ad_project_params(NUM_OF_SDI)
8+
set NUM_OF_SDIO $ad_project_params(NUM_OF_SDIO)
99
set CAPTURE_ZONE $ad_project_params(CAPTURE_ZONE)
1010
set CLK_MODE $ad_project_params(CLK_MODE)
1111
set DDR_EN $ad_project_params(DDR_EN)
1212

13-
puts "build parameters: NUM_OF_SDI: $NUM_OF_SDI ; CAPTURE_ZONE: $CAPTURE_ZONE ; CLK_MODE: $CLK_MODE ;DDR_EN: $DDR_EN"
13+
puts "build parameters: NUM_OF_SDIO: $NUM_OF_SDIO ; CAPTURE_ZONE: $CAPTURE_ZONE ; CLK_MODE: $CLK_MODE ;DDR_EN: $DDR_EN"
1414

1515
# block design ports and interfaces
1616
# specify the CNV generator's reference clock frequency in MHz
@@ -29,7 +29,7 @@ set max17687_sync_freq 400000
2929
create_bd_port -dir O ad463x_spi_sclk
3030
create_bd_port -dir O ad463x_spi_cs
3131
create_bd_port -dir O ad463x_spi_sdo
32-
create_bd_port -dir I -from [expr $NUM_OF_SDI-1] -to 0 ad463x_spi_sdi
32+
create_bd_port -dir I -from [expr $NUM_OF_SDIO-1] -to 0 ad463x_spi_sdi
3333

3434
create_bd_port -dir I ad463x_echo_sclk
3535

@@ -50,12 +50,12 @@ ad_connect spi_clk spi_clkgen/clk_0
5050

5151
# create a SPI Engine architecture
5252

53-
#spi_engine_create "spi_ad463x" 32 1 1 $NUM_OF_SDI 0 1
53+
#spi_engine_create "spi_ad463x" 32 1 1 $NUM_OF_SDIO 0 1
5454

5555
set data_width 32
5656
set async_spi_clk 1
5757
set num_cs 1
58-
set num_sdi $NUM_OF_SDI
58+
set num_sdi $NUM_OF_SDIO
5959
set num_sdo 1
6060
set sdi_delay 1
6161
set echo_sclk 1
@@ -66,7 +66,7 @@ spi_engine_create $hier_spi_engine $data_width $async_spi_clk $num_cs $num_sdi $
6666

6767
ad_ip_parameter $hier_spi_engine/${hier_spi_engine}_execution CONFIG.DEFAULT_SPI_CFG 1 ; # latching MISO on negative edge - hardware only
6868

69-
ad_ip_parameter $hier_spi_engine/${hier_spi_engine}_axi_regmap CONFIG.CFG_INFO_0 $NUM_OF_SDI
69+
ad_ip_parameter $hier_spi_engine/${hier_spi_engine}_axi_regmap CONFIG.CFG_INFO_0 $NUM_OF_SDIO
7070
ad_ip_parameter $hier_spi_engine/${hier_spi_engine}_axi_regmap CONFIG.CFG_INFO_1 $CAPTURE_ZONE
7171
ad_ip_parameter $hier_spi_engine/${hier_spi_engine}_axi_regmap CONFIG.CFG_INFO_2 $CLK_MODE
7272
ad_ip_parameter $hier_spi_engine/${hier_spi_engine}_axi_regmap CONFIG.CFG_INFO_3 $DDR_EN
@@ -92,7 +92,7 @@ ad_ip_parameter sync_generator CONFIG.PULSE_0_PERIOD $max17687_cycle
9292
ad_ip_parameter sync_generator CONFIG.PULSE_0_WIDTH [expr int(ceil(double($max17687_cycle) / 2))]
9393

9494
ad_ip_instance spi_axis_reorder data_reorder
95-
ad_ip_parameter data_reorder CONFIG.NUM_OF_LANES $NUM_OF_SDI
95+
ad_ip_parameter data_reorder CONFIG.NUM_OF_LANES $NUM_OF_SDIO
9696

9797
# dma to receive data stream
9898

@@ -161,7 +161,7 @@ if {$CAPTURE_ZONE == 1} {
161161
## SDI is latched by the data capture
162162
ad_ip_instance ad463x_data_capture data_capture
163163
ad_ip_parameter data_capture CONFIG.DDR_EN $DDR_EN
164-
ad_ip_parameter data_capture CONFIG.NUM_OF_LANES $NUM_OF_SDI
164+
ad_ip_parameter data_capture CONFIG.NUM_OF_LANES $NUM_OF_SDIO
165165

166166
ad_connect spi_clk data_capture/clk
167167
ad_connect ad463x_spi_cs data_capture/csn

‎projects/ad4630_fmc/zed/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The overwritable parameters from the environment are:
2626
- CLK_MODE: clocking mode of the device's digital interface
2727
- 0 - SPI (default)
2828
- 1 - Echo-clock or Master clock
29-
- NUM_OF_SDI: the number of MOSI lines of the SPI interface
29+
- NUM_OF_SDIO: the number of MOSI lines of the SPI interface
3030
- 1 - Interleaved
3131
- 2 - 1LPC
3232
- 4 - 2LPC (default)
@@ -45,7 +45,7 @@ The overwritable parameters from the environment are:
4545
This specific command is equivalent to running `make` only:
4646

4747
```
48-
make CLK_MODE=0 NUM_OF_SDI=4 CAPTURE_ZONE=2 DDR_EN=0
48+
make CLK_MODE=0 NUM_OF_SDIO=4 CAPTURE_ZONE=2 DDR_EN=0
4949
```
5050

5151
Corresponding device trees:
@@ -57,7 +57,7 @@ Corresponding device trees:
5757
#### Clock mode SPI, MOSI lines 2, Capture zone 2, SDR
5858

5959
```
60-
make CLK_MODE=0 NUM_OF_SDI=2 CAPTURE_ZONE=2 DDR_EN=0
60+
make CLK_MODE=0 NUM_OF_SDIO=2 CAPTURE_ZONE=2 DDR_EN=0
6161
```
6262

6363
Corresponding device trees:
@@ -69,49 +69,49 @@ Corresponding device trees:
6969
#### Clock mode 0, MOSI lines 4, Capture zone 2, SDR
7070

7171
```
72-
make CLK_MODE=0 NUM_OF_SDI=4 CAPTURE_ZONE=2 DDR_EN=0
72+
make CLK_MODE=0 NUM_OF_SDIO=4 CAPTURE_ZONE=2 DDR_EN=0
7373
```
7474

7575
Corresponding device tree: [zynq-zed-adv7511-adaq4224-24_cm0_sdi4_cz2.dts](https://github.com/analogdevicesinc/linux/blob/main/arch/arm/boot/dts/xilinx/zynq-zed-adv7511-adaq4224-24_cm0_sdi4_cz2.dts)
7676

7777
#### Clock mode 0, MOSI lines 8, Capture zone 2, SDR
7878

7979
```
80-
make CLK_MODE=0 NUM_OF_SDI=8 CAPTURE_ZONE=2 DDR_EN=0
80+
make CLK_MODE=0 NUM_OF_SDIO=8 CAPTURE_ZONE=2 DDR_EN=0
8181
```
8282

8383
#### Clock mode 1, MOSI lines 2, Capture zone 2, SDR
8484

8585
```
86-
make CLK_MODE=1 NUM_OF_SDI=2 CAPTURE_ZONE=2 DDR_EN=0
86+
make CLK_MODE=1 NUM_OF_SDIO=2 CAPTURE_ZONE=2 DDR_EN=0
8787
```
8888

8989
#### Clock mode 1, MOSI lines 4, Capture zone 2, SDR
9090

9191
```
92-
make CLK_MODE=1 NUM_OF_SDI=4 CAPTURE_ZONE=2 DDR_EN=0
92+
make CLK_MODE=1 NUM_OF_SDIO=4 CAPTURE_ZONE=2 DDR_EN=0
9393
```
9494

9595
#### Clock mode 1, MOSI lines 8, Capture zone 2, SDR
9696

9797
```
98-
make CLK_MODE=1 NUM_OF_SDI=8 CAPTURE_ZONE=2 DDR_EN=0
98+
make CLK_MODE=1 NUM_OF_SDIO=8 CAPTURE_ZONE=2 DDR_EN=0
9999
```
100100

101101
#### Clock mode 1, MOSI lines 2, Capture zone 2, DDR
102102

103103
```
104-
make CLK_MODE=1 NUM_OF_SDI=2 CAPTURE_ZONE=2 DDR_EN=1
104+
make CLK_MODE=1 NUM_OF_SDIO=2 CAPTURE_ZONE=2 DDR_EN=1
105105
```
106106

107107
#### Clock mode 1, MOSI lines 4, Capture zone 2, DDR
108108

109109
```
110-
make CLK_MODE=1 NUM_OF_SDI=4 CAPTURE_ZONE=2 DDR_EN=1
110+
make CLK_MODE=1 NUM_OF_SDIO=4 CAPTURE_ZONE=2 DDR_EN=1
111111
```
112112

113113
#### Clock mode 1, MOSI lines 8, Capture zone 2, DDR
114114

115115
```
116-
make CLK_MODE=1 NUM_OF_SDI=8 CAPTURE_ZONE=2 DDR_EN=1
116+
make CLK_MODE=1 NUM_OF_SDIO=8 CAPTURE_ZONE=2 DDR_EN=1
117117
```

‎projects/ad4630_fmc/zed/system_bd.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_
2020
ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9
2121

2222
set sys_cstring "CLK_MODE=$ad_project_params(CLK_MODE)\
23-
NUM_OF_SDI=$ad_project_params(NUM_OF_SDI)\
23+
NUM_OF_SDIO=$ad_project_params(NUM_OF_SDIO)\
2424
CAPTURE_ZONE=$ad_project_params(CAPTURE_ZONE)\
2525
DDR_EN=$ad_project_params(DDR_EN)"
2626

‎projects/ad4630_fmc/zed/system_project.tcl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ source $ad_hdl_dir/projects/scripts/adi_board.tcl
1313
# How to use over-writable parameters from the environment:
1414
#
1515
# e.g.
16-
# make NUM_OF_SDI=4 CAPTURE_ZONE=2
16+
# make NUM_OF_SDIO=4 CAPTURE_ZONE=2
1717
#
1818
#
1919
# Parameter description:
@@ -23,7 +23,7 @@ source $ad_hdl_dir/projects/scripts/adi_board.tcl
2323
# 0 - SPI Mode
2424
# 1 - Echo-clock or Master clock mode
2525
#
26-
# NUM_OF_SDI : the number of MOSI lines of the SPI interface
26+
# NUM_OF_SDIO : the number of MOSI lines of the SPI interface
2727
#
2828
# 1 - Interleaved mode
2929
# 2 - 1 lane per channel
@@ -45,12 +45,12 @@ source $ad_hdl_dir/projects/scripts/adi_board.tcl
4545
#
4646
# Example:
4747
#
48-
# make NUM_OF_SDI=2 CAPTURE_ZONE=2
48+
# make NUM_OF_SDIO=2 CAPTURE_ZONE=2
4949
#
5050

5151
adi_project ad4630_fmc_zed 0 [list \
5252
CLK_MODE [get_env_param CLK_MODE 0] \
53-
NUM_OF_SDI [get_env_param NUM_OF_SDI 4] \
53+
NUM_OF_SDIO [get_env_param NUM_OF_SDIO 4] \
5454
CAPTURE_ZONE [get_env_param CAPTURE_ZONE 2] \
5555
DDR_EN [get_env_param DDR_EN 0] ]
5656

@@ -61,7 +61,7 @@ adi_project_files ad4630_fmc_zed [list \
6161
"system_constr.xdc" \
6262
"system_top.v" ]
6363

64-
switch [get_env_param NUM_OF_SDI 4] {
64+
switch [get_env_param NUM_OF_SDIO 4] {
6565
1 {
6666
adi_project_files ad4630_fmc_zed [list \
6767
"system_constr_1sdi.xdc" ]

‎projects/ad4630_fmc/zed/system_top.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
`timescale 1ns/100ps
3737

3838
module system_top #(
39-
parameter NUM_OF_SDI = 2
39+
parameter NUM_OF_SDIO = 2
4040
) (
4141
inout [14:0] ddr_addr,
4242
inout [ 2:0] ddr_ba,
@@ -86,7 +86,7 @@ module system_top #(
8686

8787
// ad463x SPI configuration interface
8888

89-
input [NUM_OF_SDI-1:0] ad463x_spi_sdi,
89+
input [NUM_OF_SDIO-1:0] ad463x_spi_sdi,
9090
output ad463x_spi_sdo,
9191
output ad463x_spi_sclk,
9292
output ad463x_spi_cs,

‎projects/ad469x_evb/common/ad469x_qsys.tcl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ add_instance axi_spi_engine_0 axi_spi_engine
1919
set_instance_parameter_value axi_spi_engine_0 {ASYNC_SPI_CLK} {1}
2020
set_instance_parameter_value axi_spi_engine_0 {DATA_WIDTH} {32}
2121
set_instance_parameter_value axi_spi_engine_0 {MM_IF_TYPE} {0}
22-
set_instance_parameter_value axi_spi_engine_0 {NUM_OF_SDI} {1}
22+
set_instance_parameter_value axi_spi_engine_0 {NUM_OF_SDIO} {1}
2323
set_instance_parameter_value axi_spi_engine_0 {NUM_OFFLOAD} {1}
2424

2525
# spi_engine_execution
2626

2727
add_instance spi_engine_execution_0 spi_engine_execution
2828
set_instance_parameter_value spi_engine_execution_0 {DATA_WIDTH} {32}
29-
set_instance_parameter_value spi_engine_execution_0 {NUM_OF_SDI} {1}
29+
set_instance_parameter_value spi_engine_execution_0 {NUM_OF_SDIO} {1}
3030
set_instance_parameter_value spi_engine_execution_0 {SDI_DELAY} {0}
3131

3232
# spi_engine_interconnect
3333

3434
add_instance spi_engine_interconnect_0 spi_engine_interconnect
3535
set_instance_parameter_value spi_engine_interconnect_0 {DATA_WIDTH} {32}
36-
set_instance_parameter_value spi_engine_interconnect_0 {NUM_OF_SDI} {1}
36+
set_instance_parameter_value spi_engine_interconnect_0 {NUM_OF_SDIO} {1}
3737

3838
# bridges
3939

@@ -53,7 +53,7 @@ add_instance spi_engine_offload_0 spi_engine_offload
5353
set_instance_parameter_value spi_engine_offload_0 {ASYNC_TRIG} {1}
5454
set_instance_parameter_value spi_engine_offload_0 {ASYNC_SPI_CLK} {0}
5555
set_instance_parameter_value spi_engine_offload_0 {DATA_WIDTH} {32}
56-
set_instance_parameter_value spi_engine_offload_0 {NUM_OF_SDI} {1}
56+
set_instance_parameter_value spi_engine_offload_0 {NUM_OF_SDIO} {1}
5757

5858
# axi pwm gen
5959

‎projects/ad5766_sdz/common/ad5766_bd.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ current_bd_instance /spi
2626

2727
ad_ip_parameter execution CONFIG.NUM_OF_CS 1
2828
ad_ip_parameter axi CONFIG.NUM_OFFLOAD 1
29-
ad_ip_parameter interconnect CONFIG.NUM_OF_SDI 2
29+
ad_ip_parameter interconnect CONFIG.NUM_OF_SDIO 2
3030

3131
ad_connect axi/spi_engine_offload_ctrl0 axi_ad5766/spi_engine_offload_ctrl
3232
ad_connect axi/spi_engine_ctrl interconnect/s0_ctrl

0 commit comments

Comments
 (0)