Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jupiter sdr: Updates #1176

Merged
merged 4 commits into from
Sep 29, 2023
Merged

jupiter sdr: Updates #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
984346d
axi_adrv9001: Change the DDS sync structure
AndreiGrozav Sep 18, 2023
a2da70a
jupiter_sdr: PL sysmon updates
AndreiGrozav Sep 18, 2023
07c99a8
jupiter_sdr: Change the SD ctrl config to autodir
AndreiGrozav Sep 18, 2023
ffdf092
jupiter_sdr: USB power delivery always on
AndreiGrozav Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions library/axi_adrv9001/axi_adrv9001_core.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ module axi_adrv9001_core #(
wire adc_sync_m;
wire dac_sync_m;
wire dac_sync_out_1;
wire dac_sync_out_2;

reg tx1_data_valid_A_d;
reg [15:0] tx1_data_i_A_d;
Expand Down Expand Up @@ -533,7 +534,7 @@ module axi_adrv9001_core #(
.up_dac_r1_mode (up_tx1_r1_mode),
.tdd_tx_valid (tdd_tx1_valid),
.dac_clk_ratio (dac_clk_ratio),
.dac_sync_in (external_dac_sync | dac_sync_out_1),
.dac_sync_in (external_dac_sync | dac_sync_out_1 | dac_sync_out_2),
.dac_sync_out (dac_sync_out_1),
.dac_ext_sync_arm (dac_ext_sync_arm),
.dac_enable_i0 (dac_1_enable_i0),
Expand Down Expand Up @@ -588,8 +589,8 @@ module axi_adrv9001_core #(
.dac_sdr_ddr_n (tx2_sdr_ddr_n_loc),
.dac_symb_op (tx2_symb_op_loc),
.dac_symb_8_16b (tx2_symb_8_16b_loc),
.dac_sync_in (external_dac_sync | dac_sync_out_1),
.dac_sync_out (),
.dac_sync_in (external_dac_sync | dac_sync_out_1 | dac_sync_out_2),
.dac_sync_out (dac_sync_out_2),
.dac_valid (dac_2_valid),
.dac_enable_i0 (dac_2_enable_i0),
.dac_data_i0 (dac_2_data_i0[15:0]),
Expand Down
24 changes: 21 additions & 3 deletions projects/jupiter_sdr/system_bd.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ ad_ip_parameter sys_ps8 CONFIG.PSU__QSPI__PERIPHERAL__ENABLE {1}
ad_ip_parameter sys_ps8 CONFIG.PSU__QSPI__PERIPHERAL__MODE {Dual Parallel}
ad_ip_parameter sys_ps8 CONFIG.PSU__QSPI__PERIPHERAL__DATA_MODE {x4}
ad_ip_parameter sys_ps8 CONFIG.PSU__SD1__PERIPHERAL__ENABLE {1}
ad_ip_parameter sys_ps8 CONFIG.PSU__SD1__PERIPHERAL__IO {MIO 39 .. 51}
ad_ip_parameter sys_ps8 CONFIG.PSU__SD1__SLOT_TYPE {SD 3.0 AUTODIR}
ad_ip_parameter sys_ps8 CONFIG.PSU__SD1__GRP_CD__ENABLE {1}
ad_ip_parameter sys_ps8 CONFIG.PSU__SD1__GRP_POW__ENABLE {0}
ad_ip_parameter sys_ps8 CONFIG.PSU__SD1__GRP_WP__ENABLE {0}
ad_ip_parameter sys_ps8 CONFIG.PSU__SD1__PERIPHERAL__IO {MIO 39 46 .. 51}
ad_ip_parameter sys_ps8 CONFIG.PSU__SWDT0__PERIPHERAL__ENABLE {1}
ad_ip_parameter sys_ps8 CONFIG.PSU__SWDT1__PERIPHERAL__ENABLE {1}
ad_ip_parameter sys_ps8 CONFIG.PSU__TTC0__PERIPHERAL__ENABLE {1}
Expand Down Expand Up @@ -502,12 +506,11 @@ ad_connect tx2_enable axi_adrv9001/tx2_enable
ad_connect system_sync axi_adrv9001/adc_sync_in
ad_connect system_sync axi_adrv9001/dac_sync_in

# sysytem monitor
# system monitor

ad_ip_instance system_management_wiz pl_sysmon

set_property -dict [list \
CONFIG.CHANNEL_ENABLE_VBRAM {true} \
CONFIG.CHANNEL_ENABLE_VP_VN {false} \
CONFIG.CHANNEL_ENABLE_VAUXP0_VAUXN0 {true} \
CONFIG.CHANNEL_ENABLE_VAUXP1_VAUXN1 {true} \
Expand All @@ -521,6 +524,20 @@ set_property -dict [list \
CONFIG.CHANNEL_ENABLE_VAUXP9_VAUXN9 {true} \
CONFIG.CHANNEL_ENABLE_VAUXP10_VAUXN10 {true} \
CONFIG.CHANNEL_ENABLE_VUSER0 {true} \
CONFIG.CHANNEL_ENABLE_VUSER1 {true} \
CONFIG.SELECT_USER_SUPPLY1 {VCCO} \
CONFIG.USER_SUPPLY1_BANK {26} \
CONFIG.CHANNEL_ENABLE_TEMPERATURE {true} \
CONFIG.CHANNEL_ENABLE_VBRAM {false} \
CONFIG.CHANNEL_ENABLE_VCCAUX {true} \
CONFIG.CHANNEL_ENABLE_VCCINT {true} \
CONFIG.ENABLE_VCCPSAUX_ALARM {false} \
CONFIG.ENABLE_VCCPSINTFP_ALARM {false} \
CONFIG.ENABLE_VCCPSINTLP_ALARM {false} \
CONFIG.OT_ALARM {true} \
CONFIG.USER_TEMP_ALARM {false} \
CONFIG.VCCAUX_ALARM {false} \
CONFIG.VCCINT_ALARM {false} \
CONFIG.USER_SUPPLY0_ALARM {false} \
CONFIG.USER_SUPPLY0_BANK {66} \
CONFIG.ANALOG_BANK_SELECTION {66} \
Expand Down Expand Up @@ -599,6 +616,7 @@ ad_cpu_interrupt ps-13 mb-12 axi_adrv9001_rx1_dma/irq
ad_cpu_interrupt ps-12 mb-11 axi_adrv9001_rx2_dma/irq
ad_cpu_interrupt ps-11 mb-6 axi_adrv9001_tx1_dma/irq
ad_cpu_interrupt ps-10 mb-5 axi_adrv9001_tx2_dma/irq
ad_cpu_interrupt ps-9 mb-4 pl_sysmon/ip2intc_irpt

set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt;

Expand Down
3 changes: 1 addition & 2 deletions projects/jupiter_sdr/system_top.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,7 @@ module system_top (

assign mssi_sync = mcs_sync_busy | gpio_o[7];

// TO-DO
//assign usb_pd_reset = gpio_o[8];
assign usb_pd_reset = 1'b0;
assign adrv9002_mcssrc = gpio_o[65];
assign usb_flash_prog_en = gpio_o[66];
assign fan_en = 1'b1;
Expand Down
Loading