zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adrv9001[intel]: Add second pair of DMAs 

fix observations for PR
main
LIacob106 2021-08-31 17:29:16 +01:00 committed by LIacob106
parent fec4137046
commit 16a93a804b
2 changed files with 114 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/axi_adrv9001/axi_adrv9001_hw.tcl
View File

@ -169,6 +169,11 @@ add_interface_port dac_2_ch_1 dac_2_data_q0 data Input 16
ad_interface signal dac_2_dunf input 1 unf
set_interface_property dac_2_ch_0 associatedClock if_dac_2_clk
set_interface_property dac_2_ch_1 associatedClock if_dac_2_clk
set_interface_property dac_2_ch_0 associatedReset dac_2_rst
set_interface_property dac_2_ch_1 associatedReset dac_2_rst
add_interface tdd_if conduit end
add_interface_port tdd_if gpio_rx1_enable_in rx1_enable_in Input 1
add_interface_port tdd_if gpio_rx2_enable_in rx2_enable_in Input 1

112
projects/adrv9001/common/adrv9001_qsys.tcl
View File

@ -28,6 +28,21 @@ add_connection axi_adrv9001.adc_1_ch_2 util_adc_wfifo.din_2
add_connection axi_adrv9001.adc_1_ch_3 util_adc_wfifo.din_3
add_connection util_adc_wfifo.if_din_ovf axi_adrv9001.if_adc_1_dovf
# adc-wfifo2
add_instance util_adc_wfifo2 util_wfifo
set_instance_parameter_value util_adc_wfifo2 {NUM_OF_CHANNELS} {2}
set_instance_parameter_value util_adc_wfifo2 {DIN_DATA_WIDTH} {16}
set_instance_parameter_value util_adc_wfifo2 {DOUT_DATA_WIDTH} {16}
set_instance_parameter_value util_adc_wfifo2 {DIN_ADDRESS_WIDTH} {5}
add_connection axi_adrv9001.if_adc_2_clk util_adc_wfifo2.if_din_clk
add_connection axi_adrv9001.if_adc_2_rst util_adc_wfifo2.if_din_rst
add_connection sys_dma_clk.clk util_adc_wfifo2.if_dout_clk
add_connection sys_dma_clk.clk_reset util_adc_wfifo2.if_dout_rstn
add_connection axi_adrv9001.adc_2_ch_0 util_adc_wfifo2.din_0
add_connection axi_adrv9001.adc_2_ch_1 util_adc_wfifo2.din_1
add_connection util_adc_wfifo2.if_din_ovf axi_adrv9001.if_adc_2_dovf
# dac-rfifo
add_instance util_dac_rfifo util_rfifo
@ -45,6 +60,21 @@ add_connection util_dac_rfifo.dout_2 axi_adrv9001.dac_1_ch_2
add_connection util_dac_rfifo.dout_3 axi_adrv9001.dac_1_ch_3
add_connection util_dac_rfifo.if_dout_unf axi_adrv9001.if_dac_1_dunf
# dac-rfifo2
add_instance util_dac_rfifo2 util_rfifo
set_instance_parameter_value util_dac_rfifo2 {NUM_OF_CHANNELS} {2}
set_instance_parameter_value util_dac_rfifo2 {DIN_DATA_WIDTH} {16}
set_instance_parameter_value util_dac_rfifo2 {DOUT_DATA_WIDTH} {16}
set_instance_parameter_value util_dac_rfifo2 {DIN_ADDRESS_WIDTH} {5}
add_connection axi_adrv9001.if_dac_2_clk util_dac_rfifo2.if_dout_clk
add_connection axi_adrv9001.if_dac_2_rst util_dac_rfifo2.if_dout_rst
add_connection sys_dma_clk.clk util_dac_rfifo2.if_din_clk
add_connection sys_dma_clk.clk_reset util_dac_rfifo2.if_din_rstn
add_connection util_dac_rfifo2.dout_0 axi_adrv9001.dac_2_ch_0
add_connection util_dac_rfifo2.dout_1 axi_adrv9001.dac_2_ch_1
add_connection util_dac_rfifo2.if_dout_unf axi_adrv9001.if_dac_2_dunf
# adc-pack
add_instance util_adc_pack util_cpack2
@ -58,6 +88,17 @@ add_connection util_adc_wfifo.dout_2 util_adc_pack.adc_ch_2
add_connection util_adc_wfifo.dout_3 util_adc_pack.adc_ch_3
add_connection util_adc_pack.if_fifo_wr_overflow util_adc_wfifo.if_dout_ovf
# adc-pack2
add_instance util_adc_pack2 util_cpack2
set_instance_parameter_value util_adc_pack2 {NUM_OF_CHANNELS} {2}
set_instance_parameter_value util_adc_pack2 {SAMPLE_DATA_WIDTH} {16}
add_connection sys_dma_clk.clk util_adc_pack2.clk
add_connection sys_dma_clk.clk_reset util_adc_pack2.reset
add_connection util_adc_wfifo2.dout_0 util_adc_pack2.adc_ch_0
add_connection util_adc_wfifo2.dout_1 util_adc_pack2.adc_ch_1
add_connection util_adc_pack2.if_fifo_wr_overflow util_adc_wfifo2.if_dout_ovf
# dac-unpack
add_instance util_dac_upack util_upack2
@ -71,12 +112,23 @@ add_connection util_dac_upack.dac_ch_2 util_dac_rfifo.din_2
add_connection util_dac_upack.dac_ch_3 util_dac_rfifo.din_3
add_connection util_dac_upack.if_fifo_rd_underflow util_dac_rfifo.if_din_unf
# dac-unpack2
add_instance util_dac_upack2 util_upack2
set_instance_parameter_value util_dac_upack2 {NUM_OF_CHANNELS} {2}
set_instance_parameter_value util_dac_upack2 {SAMPLE_DATA_WIDTH} {16}
add_connection sys_dma_clk.clk util_dac_upack2.clk
add_connection sys_dma_clk.clk_reset util_dac_upack2.reset
add_connection util_dac_upack2.dac_ch_0 util_dac_rfifo2.din_0
add_connection util_dac_upack2.dac_ch_1 util_dac_rfifo2.din_1
add_connection util_dac_upack2.if_fifo_rd_underflow util_dac_rfifo2.if_din_unf
# adc-dma
add_instance axi_adc_dma axi_dmac
set_instance_parameter_value axi_adc_dma {ID} {0}
set_instance_parameter_value axi_adc_dma {DMA_DATA_WIDTH_SRC} {64}
set_instance_parameter_value axi_adc_dma {DMA_DATA_WIDTH_DEST} {128}
set_instance_parameter_value axi_adc_dma {DMA_DATA_WIDTH_DEST} {64}
set_instance_parameter_value axi_adc_dma {DMA_LENGTH_WIDTH} {24}
set_instance_parameter_value axi_adc_dma {DMA_2D_TRANSFER} {0}
set_instance_parameter_value axi_adc_dma {AXI_SLICE_DEST} {0}
@ -96,6 +148,32 @@ add_connection util_adc_pack.if_packed_fifo_wr_sync axi_adc_dma.if_fifo_wr_sync
add_connection util_adc_pack.if_packed_fifo_wr_data axi_adc_dma.if_fifo_wr_din
add_connection axi_adc_dma.if_fifo_wr_overflow util_adc_pack.if_packed_fifo_wr_overflow
# adc-dma2
add_instance axi_adc_dma2 axi_dmac
set_instance_parameter_value axi_adc_dma2 {ID} {1}
set_instance_parameter_value axi_adc_dma2 {DMA_DATA_WIDTH_SRC} {32}
set_instance_parameter_value axi_adc_dma2 {DMA_DATA_WIDTH_DEST} {64}
set_instance_parameter_value axi_adc_dma2 {DMA_LENGTH_WIDTH} {24}
set_instance_parameter_value axi_adc_dma2 {DMA_2D_TRANSFER} {0}
set_instance_parameter_value axi_adc_dma2 {AXI_SLICE_DEST} {0}
set_instance_parameter_value axi_adc_dma2 {AXI_SLICE_SRC} {0}
set_instance_parameter_value axi_adc_dma2 {SYNC_TRANSFER_START} {1}
set_instance_parameter_value axi_adc_dma2 {CYCLIC} {0}
set_instance_parameter_value axi_adc_dma2 {DMA_TYPE_DEST} {0}
set_instance_parameter_value axi_adc_dma2 {DMA_TYPE_SRC} {2}
set_instance_parameter_value axi_adc_dma2 {FIFO_SIZE} {2}
set_instance_parameter_value axi_adc_dma2 {MAX_BYTES_PER_BURST} {64}
add_connection sys_clk.clk axi_adc_dma2.s_axi_clock
add_connection sys_clk.clk_reset axi_adc_dma2.s_axi_reset
add_connection sys_dma_clk.clk axi_adc_dma2.m_dest_axi_clock
add_connection sys_dma_clk.clk_reset axi_adc_dma2.m_dest_axi_reset
add_connection sys_dma_clk.clk axi_adc_dma2.if_fifo_wr_clk
add_connection util_adc_pack2.if_packed_fifo_wr_en axi_adc_dma2.if_fifo_wr_en
add_connection util_adc_pack2.if_packed_fifo_wr_sync axi_adc_dma2.if_fifo_wr_sync
add_connection util_adc_pack2.if_packed_fifo_wr_data axi_adc_dma2.if_fifo_wr_din
add_connection axi_adc_dma2.if_fifo_wr_overflow util_adc_pack2.if_packed_fifo_wr_overflow
# dac-dma
add_instance axi_dac_dma axi_dmac
@ -116,9 +194,31 @@ add_connection sys_clk.clk_reset axi_dac_dma.s_axi_reset
add_connection sys_dma_clk.clk axi_dac_dma.m_src_axi_clock
add_connection sys_dma_clk.clk_reset axi_dac_dma.m_src_axi_reset
add_connection sys_dma_clk.clk axi_dac_dma.if_m_axis_aclk
add_connection axi_dac_dma.m_axis util_dac_upack.s_axis
# dac-dma2
add_instance axi_dac_dma2 axi_dmac
set_instance_parameter_value axi_dac_dma2 {ID} {1}
set_instance_parameter_value axi_dac_dma2 {DMA_DATA_WIDTH_SRC} {64}
set_instance_parameter_value axi_dac_dma2 {DMA_DATA_WIDTH_DEST} {32}
set_instance_parameter_value axi_dac_dma2 {DMA_LENGTH_WIDTH} {24}
set_instance_parameter_value axi_dac_dma2 {DMA_2D_TRANSFER} {0}
set_instance_parameter_value axi_dac_dma2 {AXI_SLICE_DEST} {0}
set_instance_parameter_value axi_dac_dma2 {AXI_SLICE_SRC} {0}
set_instance_parameter_value axi_dac_dma2 {SYNC_TRANSFER_START} {0}
set_instance_parameter_value axi_dac_dma2 {CYCLIC} {1}
set_instance_parameter_value axi_dac_dma2 {DMA_TYPE_DEST} {1}
set_instance_parameter_value axi_dac_dma2 {DMA_TYPE_SRC} {0}
set_instance_parameter_value axi_dac_dma2 {FIFO_SIZE} {2}
set_instance_parameter_value axi_dac_dma2 {MAX_BYTES_PER_BURST} {64}
add_connection sys_clk.clk axi_dac_dma2.s_axi_clock
add_connection sys_clk.clk_reset axi_dac_dma2.s_axi_reset
add_connection sys_dma_clk.clk axi_dac_dma2.m_src_axi_clock
add_connection sys_dma_clk.clk_reset axi_dac_dma2.m_src_axi_reset
add_connection sys_dma_clk.clk axi_dac_dma2.if_m_axis_aclk
add_connection axi_dac_dma2.m_axis util_dac_upack2.s_axis
# adrv9001 gpio
add_instance avl_adrv9001_gpio altera_avalon_pio
@ -134,16 +234,22 @@ set_interface_property adrv9001_gpio EXPORT_OF avl_adrv9001_gpio.external_connec
ad_cpu_interrupt 2 axi_adc_dma.interrupt_sender
ad_cpu_interrupt 3 axi_dac_dma.interrupt_sender
ad_cpu_interrupt 11 axi_adc_dma2.interrupt_sender
ad_cpu_interrupt 12 axi_dac_dma2.interrupt_sender
ad_cpu_interrupt 14 avl_adrv9001_gpio.irq
# cpu interconnects
ad_cpu_interconnect 0x00020000 axi_adrv9001.s_axi
ad_cpu_interconnect 0x00040000 axi_adc_dma.s_axi
ad_cpu_interconnect 0x00041000 axi_adc_dma2.s_axi
ad_cpu_interconnect 0x00044000 axi_dac_dma.s_axi
ad_cpu_interconnect 0x00060000 avl_adrv9001_gpio.s1
ad_cpu_interconnect 0x00045000 axi_dac_dma2.s_axi
ad_cpu_interconnect 0x00060000 avl_adrv9001_gpio.s1
# mem interconnects
ad_dma_interconnect axi_adc_dma.m_dest_axi
ad_dma_interconnect axi_dac_dma.m_src_axi
ad_dma_interconnect axi_adc_dma2.m_dest_axi
ad_dma_interconnect axi_dac_dma2.m_src_axi