From 509f031d58d9563e541be9ae43cb367483cac6f5 Mon Sep 17 00:00:00 2001 From: Rejeesh Kutty Date: Fri, 10 Jun 2016 14:20:00 -0400 Subject: [PATCH] fmcomms11- updates --- projects/fmcomms11/common/fmcomms11_bd.tcl | 345 ++++++++++++--------- projects/fmcomms11/common/fmcomms11_spi.v | 45 ++- 2 files changed, 227 insertions(+), 163 deletions(-) diff --git a/projects/fmcomms11/common/fmcomms11_bd.tcl b/projects/fmcomms11/common/fmcomms11_bd.tcl index d9c58fdd2..a33f06c09 100644 --- a/projects/fmcomms11/common/fmcomms11_bd.tcl +++ b/projects/fmcomms11/common/fmcomms11_bd.tcl @@ -1,26 +1,25 @@ -# daq2 +# fmcomms11 + +create_bd_port -dir I sysref create_bd_port -dir I rx_ref_clk create_bd_port -dir O rx_sync -create_bd_port -dir I rx_sysref -create_bd_port -dir I -from 3 -to 0 rx_data_p -create_bd_port -dir I -from 3 -to 0 rx_data_n +create_bd_port -dir I -from 7 -to 0 rx_data_p +create_bd_port -dir I -from 7 -to 0 rx_data_n create_bd_port -dir I tx_ref_clk create_bd_port -dir I tx_sync -create_bd_port -dir I tx_sysref -create_bd_port -dir O -from 3 -to 0 tx_data_p -create_bd_port -dir O -from 3 -to 0 tx_data_n +create_bd_port -dir O -from 7 -to 0 tx_data_p +create_bd_port -dir O -from 7 -to 0 tx_data_n # dac peripherals set axi_ad9144_core [create_bd_cell -type ip -vlnv analog.com:user:axi_ad9144:1.0 axi_ad9144_core] -set_property -dict [list CONFIG.QUAD_OR_DUAL_N {0}] $axi_ad9144_core set axi_ad9144_jesd [create_bd_cell -type ip -vlnv xilinx.com:ip:jesd204:6.2 axi_ad9144_jesd] set_property -dict [list CONFIG.C_NODE_IS_TRANSMIT {1}] $axi_ad9144_jesd -set_property -dict [list CONFIG.C_LANES {4}] $axi_ad9144_jesd +set_property -dict [list CONFIG.C_LANES {8}] $axi_ad9144_jesd set axi_ad9144_dma [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 axi_ad9144_dma] set_property -dict [list CONFIG.DMA_TYPE_SRC {0}] $axi_ad9144_dma @@ -31,118 +30,176 @@ set_property -dict [list CONFIG.AXI_SLICE_DEST {0}] $axi_ad9144_dma set_property -dict [list CONFIG.DMA_LENGTH_WIDTH {24}] $axi_ad9144_dma set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $axi_ad9144_dma set_property -dict [list CONFIG.CYCLIC {0}] $axi_ad9144_dma -set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {128}] $axi_ad9144_dma -set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {128}] $axi_ad9144_dma - -set axi_ad9144_upack [create_bd_cell -type ip -vlnv analog.com:user:util_upack:1.0 axi_ad9144_upack] -set_property -dict [list CONFIG.CHANNEL_DATA_WIDTH {64}] $axi_ad9144_upack -set_property -dict [list CONFIG.NUM_OF_CHANNELS {2}] $axi_ad9144_upack +set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {256}] $axi_ad9144_dma +set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {256}] $axi_ad9144_dma # adc peripherals -set axi_ad9680_core [create_bd_cell -type ip -vlnv analog.com:user:axi_ad9680:1.0 axi_ad9680_core] +set axi_ad9625_core [create_bd_cell -type ip -vlnv analog.com:user:axi_ad9625:1.0 axi_ad9625_core] -set axi_ad9680_jesd [create_bd_cell -type ip -vlnv xilinx.com:ip:jesd204:6.2 axi_ad9680_jesd] -set_property -dict [list CONFIG.C_NODE_IS_TRANSMIT {0}] $axi_ad9680_jesd -set_property -dict [list CONFIG.C_LANES {4}] $axi_ad9680_jesd +set axi_ad9625_jesd [create_bd_cell -type ip -vlnv xilinx.com:ip:jesd204:6.2 axi_ad9625_jesd] +set_property -dict [list CONFIG.C_NODE_IS_TRANSMIT {0}] $axi_ad9625_jesd +set_property -dict [list CONFIG.C_LANES {8}] $axi_ad9625_jesd -set axi_ad9680_dma [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 axi_ad9680_dma] -set_property -dict [list CONFIG.DMA_TYPE_SRC {1}] $axi_ad9680_dma -set_property -dict [list CONFIG.DMA_TYPE_DEST {0}] $axi_ad9680_dma -set_property -dict [list CONFIG.ID {0}] $axi_ad9680_dma -set_property -dict [list CONFIG.AXI_SLICE_SRC {0}] $axi_ad9680_dma -set_property -dict [list CONFIG.AXI_SLICE_DEST {0}] $axi_ad9680_dma -set_property -dict [list CONFIG.SYNC_TRANSFER_START {1}] $axi_ad9680_dma -set_property -dict [list CONFIG.DMA_LENGTH_WIDTH {24}] $axi_ad9680_dma -set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $axi_ad9680_dma -set_property -dict [list CONFIG.CYCLIC {0}] $axi_ad9680_dma -set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {64}] $axi_ad9680_dma -set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {64}] $axi_ad9680_dma - -set axi_ad9680_cpack [create_bd_cell -type ip -vlnv analog.com:user:util_cpack:1.0 axi_ad9680_cpack] -set_property -dict [list CONFIG.CHANNEL_DATA_WIDTH {64}] $axi_ad9680_cpack -set_property -dict [list CONFIG.NUM_OF_CHANNELS {2}] $axi_ad9680_cpack +set axi_ad9625_dma [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 axi_ad9625_dma] +set_property -dict [list CONFIG.DMA_TYPE_SRC {1}] $axi_ad9625_dma +set_property -dict [list CONFIG.DMA_TYPE_DEST {0}] $axi_ad9625_dma +set_property -dict [list CONFIG.ID {0}] $axi_ad9625_dma +set_property -dict [list CONFIG.AXI_SLICE_SRC {0}] $axi_ad9625_dma +set_property -dict [list CONFIG.AXI_SLICE_DEST {0}] $axi_ad9625_dma +set_property -dict [list CONFIG.SYNC_TRANSFER_START {0}] $axi_ad9625_dma +set_property -dict [list CONFIG.DMA_LENGTH_WIDTH {24}] $axi_ad9625_dma +set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $axi_ad9625_dma +set_property -dict [list CONFIG.CYCLIC {0}] $axi_ad9625_dma +set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {64}] $axi_ad9625_dma +set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {64}] $axi_ad9625_dma # dac/adc common gt -set axi_daq2_gt [create_bd_cell -type ip -vlnv analog.com:user:axi_jesd_gt:1.0 axi_daq2_gt] -set_property -dict [list CONFIG.NUM_OF_LANES {4}] $axi_daq2_gt -set_property -dict [list CONFIG.QPLL1_ENABLE {0}] $axi_daq2_gt -set_property -dict [list CONFIG.RX_NUM_OF_LANES {4}] $axi_daq2_gt -set_property -dict [list CONFIG.TX_NUM_OF_LANES {4}] $axi_daq2_gt -set_property -dict [list CONFIG.RX_CLKBUF_ENABLE_0 {1}] $axi_daq2_gt -set_property -dict [list CONFIG.TX_CLKBUF_ENABLE_0 {1}] $axi_daq2_gt -set_property -dict [list CONFIG.TX_DATA_SEL_0 {0}] $axi_daq2_gt -set_property -dict [list CONFIG.TX_DATA_SEL_1 {3}] $axi_daq2_gt -set_property -dict [list CONFIG.TX_DATA_SEL_2 {1}] $axi_daq2_gt -set_property -dict [list CONFIG.TX_DATA_SEL_3 {2}] $axi_daq2_gt +set axi_fmcomms11_gt [create_bd_cell -type ip -vlnv analog.com:user:axi_jesd_gt:1.0 axi_fmcomms11_gt] +set_property -dict [list CONFIG.NUM_OF_LANES {8}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.QPLL0_ENABLE {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.QPLL1_ENABLE {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_NUM_OF_LANES {8}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_NUM_OF_LANES {8}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CLKBUF_ENABLE_0 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_CLKBUF_ENABLE_0 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.CPLL_FBDIV_0 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_OUT_DIV_0 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_OUT_DIV_0 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CLK25_DIV_0 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_CLK25_DIV_0 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.PMA_RSV_0 {0x00018480}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CDR_CFG_0 {0x03000023ff20400020}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.CPLL_FBDIV_1 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_OUT_DIV_1 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_OUT_DIV_1 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CLK25_DIV_1 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_CLK25_DIV_1 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.PMA_RSV_1 {0x00018480}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CDR_CFG_1 {0x03000023ff20400020}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.CPLL_FBDIV_2 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_OUT_DIV_2 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_OUT_DIV_2 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CLK25_DIV_2 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_CLK25_DIV_2 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.PMA_RSV_2 {0x00018480}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CDR_CFG_2 {0x03000023ff20400020}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.CPLL_FBDIV_3 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_OUT_DIV_3 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_OUT_DIV_3 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CLK25_DIV_3 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_CLK25_DIV_3 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.PMA_RSV_3 {0x00018480}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CDR_CFG_3 {0x03000023ff20400020}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.CPLL_FBDIV_4 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_OUT_DIV_4 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_OUT_DIV_4 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CLK25_DIV_4 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_CLK25_DIV_4 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.PMA_RSV_4 {0x00018480}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CDR_CFG_4 {0x03000023ff20400020}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.CPLL_FBDIV_5 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_OUT_DIV_5 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_OUT_DIV_5 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CLK25_DIV_5 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_CLK25_DIV_5 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.PMA_RSV_5 {0x00018480}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CDR_CFG_5 {0x03000023ff20400020}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.CPLL_FBDIV_6 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_OUT_DIV_6 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_OUT_DIV_6 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CLK25_DIV_6 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_CLK25_DIV_6 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.PMA_RSV_6 {0x00018480}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CDR_CFG_6 {0x03000023ff20400020}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.CPLL_FBDIV_7 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_OUT_DIV_7 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_OUT_DIV_7 {1}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CLK25_DIV_7 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.TX_CLK25_DIV_7 {25}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.PMA_RSV_7 {0x00018480}] $axi_fmcomms11_gt +set_property -dict [list CONFIG.RX_CDR_CFG_7 {0x03000023ff20400020}] $axi_fmcomms11_gt -set util_daq2_gt [create_bd_cell -type ip -vlnv analog.com:user:util_jesd_gt:1.0 util_daq2_gt] -set_property -dict [list CONFIG.QPLL0_ENABLE {1}] $util_daq2_gt -set_property -dict [list CONFIG.QPLL1_ENABLE {0}] $util_daq2_gt -set_property -dict [list CONFIG.NUM_OF_LANES {4}] $util_daq2_gt -set_property -dict [list CONFIG.RX_ENABLE {1}] $util_daq2_gt -set_property -dict [list CONFIG.RX_NUM_OF_LANES {4}] $util_daq2_gt -set_property -dict [list CONFIG.TX_ENABLE {1}] $util_daq2_gt -set_property -dict [list CONFIG.TX_NUM_OF_LANES {4}] $util_daq2_gt +set util_fmcomms11_gt [create_bd_cell -type ip -vlnv analog.com:user:util_jesd_gt:1.0 util_fmcomms11_gt] +set_property -dict [list CONFIG.QPLL0_ENABLE {1}] $util_fmcomms11_gt +set_property -dict [list CONFIG.QPLL1_ENABLE {1}] $util_fmcomms11_gt +set_property -dict [list CONFIG.NUM_OF_LANES {8}] $util_fmcomms11_gt +set_property -dict [list CONFIG.RX_ENABLE {1}] $util_fmcomms11_gt +set_property -dict [list CONFIG.RX_NUM_OF_LANES {8}] $util_fmcomms11_gt +set_property -dict [list CONFIG.TX_ENABLE {1}] $util_fmcomms11_gt +set_property -dict [list CONFIG.TX_NUM_OF_LANES {8}] $util_fmcomms11_gt # connections (gt) -ad_connect util_daq2_gt/qpll_ref_clk rx_ref_clk -ad_connect util_daq2_gt/cpll_ref_clk tx_ref_clk +ad_connect util_fmcomms11_gt/qpll_ref_clk rx_ref_clk +ad_connect util_fmcomms11_gt/cpll_ref_clk tx_ref_clk -ad_connect axi_daq2_gt/gt_qpll_0 util_daq2_gt/gt_qpll_0 -ad_connect axi_daq2_gt/gt_pll_0 util_daq2_gt/gt_pll_0 -ad_connect axi_daq2_gt/gt_pll_1 util_daq2_gt/gt_pll_1 -ad_connect axi_daq2_gt/gt_pll_2 util_daq2_gt/gt_pll_2 -ad_connect axi_daq2_gt/gt_pll_3 util_daq2_gt/gt_pll_3 -ad_connect axi_daq2_gt/gt_rx_0 util_daq2_gt/gt_rx_0 -ad_connect axi_daq2_gt/gt_rx_1 util_daq2_gt/gt_rx_1 -ad_connect axi_daq2_gt/gt_rx_2 util_daq2_gt/gt_rx_2 -ad_connect axi_daq2_gt/gt_rx_3 util_daq2_gt/gt_rx_3 -ad_connect axi_daq2_gt/gt_rx_ip_0 axi_ad9680_jesd/gt0_rx -ad_connect axi_daq2_gt/gt_rx_ip_1 axi_ad9680_jesd/gt1_rx -ad_connect axi_daq2_gt/gt_rx_ip_2 axi_ad9680_jesd/gt2_rx -ad_connect axi_daq2_gt/gt_rx_ip_3 axi_ad9680_jesd/gt3_rx -ad_connect axi_daq2_gt/rx_gt_comma_align_enb_0 axi_ad9680_jesd/rxencommaalign_out -ad_connect axi_daq2_gt/rx_gt_comma_align_enb_1 axi_ad9680_jesd/rxencommaalign_out -ad_connect axi_daq2_gt/rx_gt_comma_align_enb_2 axi_ad9680_jesd/rxencommaalign_out -ad_connect axi_daq2_gt/rx_gt_comma_align_enb_3 axi_ad9680_jesd/rxencommaalign_out -ad_connect axi_daq2_gt/gt_tx_0 util_daq2_gt/gt_tx_0 -ad_connect axi_daq2_gt/gt_tx_1 util_daq2_gt/gt_tx_1 -ad_connect axi_daq2_gt/gt_tx_2 util_daq2_gt/gt_tx_2 -ad_connect axi_daq2_gt/gt_tx_3 util_daq2_gt/gt_tx_3 -ad_connect axi_daq2_gt/gt_tx_ip_0 axi_ad9144_jesd/gt0_tx -ad_connect axi_daq2_gt/gt_tx_ip_1 axi_ad9144_jesd/gt1_tx -ad_connect axi_daq2_gt/gt_tx_ip_2 axi_ad9144_jesd/gt2_tx -ad_connect axi_daq2_gt/gt_tx_ip_3 axi_ad9144_jesd/gt3_tx +ad_connect axi_fmcomms11_gt/gt_qpll_0 util_fmcomms11_gt/gt_qpll_0 +ad_connect axi_fmcomms11_gt/gt_qpll_1 util_fmcomms11_gt/gt_qpll_1 +ad_connect axi_fmcomms11_gt/gt_pll_0 util_fmcomms11_gt/gt_pll_0 +ad_connect axi_fmcomms11_gt/gt_pll_1 util_fmcomms11_gt/gt_pll_1 +ad_connect axi_fmcomms11_gt/gt_pll_2 util_fmcomms11_gt/gt_pll_2 +ad_connect axi_fmcomms11_gt/gt_pll_3 util_fmcomms11_gt/gt_pll_3 +ad_connect axi_fmcomms11_gt/gt_pll_4 util_fmcomms11_gt/gt_pll_4 +ad_connect axi_fmcomms11_gt/gt_pll_5 util_fmcomms11_gt/gt_pll_5 +ad_connect axi_fmcomms11_gt/gt_pll_6 util_fmcomms11_gt/gt_pll_6 +ad_connect axi_fmcomms11_gt/gt_pll_7 util_fmcomms11_gt/gt_pll_7 +ad_connect axi_fmcomms11_gt/gt_rx_0 util_fmcomms11_gt/gt_rx_0 +ad_connect axi_fmcomms11_gt/gt_rx_1 util_fmcomms11_gt/gt_rx_1 +ad_connect axi_fmcomms11_gt/gt_rx_2 util_fmcomms11_gt/gt_rx_2 +ad_connect axi_fmcomms11_gt/gt_rx_3 util_fmcomms11_gt/gt_rx_3 +ad_connect axi_fmcomms11_gt/gt_rx_4 util_fmcomms11_gt/gt_rx_4 +ad_connect axi_fmcomms11_gt/gt_rx_5 util_fmcomms11_gt/gt_rx_5 +ad_connect axi_fmcomms11_gt/gt_rx_6 util_fmcomms11_gt/gt_rx_6 +ad_connect axi_fmcomms11_gt/gt_rx_7 util_fmcomms11_gt/gt_rx_7 +ad_connect axi_fmcomms11_gt/gt_rx_ip_0 axi_ad9625_jesd/gt0_rx +ad_connect axi_fmcomms11_gt/gt_rx_ip_1 axi_ad9625_jesd/gt1_rx +ad_connect axi_fmcomms11_gt/gt_rx_ip_2 axi_ad9625_jesd/gt2_rx +ad_connect axi_fmcomms11_gt/gt_rx_ip_3 axi_ad9625_jesd/gt3_rx +ad_connect axi_fmcomms11_gt/gt_rx_ip_4 axi_ad9625_jesd/gt4_rx +ad_connect axi_fmcomms11_gt/gt_rx_ip_5 axi_ad9625_jesd/gt5_rx +ad_connect axi_fmcomms11_gt/gt_rx_ip_6 axi_ad9625_jesd/gt6_rx +ad_connect axi_fmcomms11_gt/gt_rx_ip_7 axi_ad9625_jesd/gt7_rx +ad_connect axi_fmcomms11_gt/rx_gt_comma_align_enb_0 axi_ad9625_jesd/rxencommaalign_out +ad_connect axi_fmcomms11_gt/rx_gt_comma_align_enb_1 axi_ad9625_jesd/rxencommaalign_out +ad_connect axi_fmcomms11_gt/rx_gt_comma_align_enb_2 axi_ad9625_jesd/rxencommaalign_out +ad_connect axi_fmcomms11_gt/rx_gt_comma_align_enb_3 axi_ad9625_jesd/rxencommaalign_out +ad_connect axi_fmcomms11_gt/gt_tx_0 util_fmcomms11_gt/gt_tx_0 +ad_connect axi_fmcomms11_gt/gt_tx_1 util_fmcomms11_gt/gt_tx_1 +ad_connect axi_fmcomms11_gt/gt_tx_2 util_fmcomms11_gt/gt_tx_2 +ad_connect axi_fmcomms11_gt/gt_tx_3 util_fmcomms11_gt/gt_tx_3 +ad_connect axi_fmcomms11_gt/gt_tx_4 util_fmcomms11_gt/gt_tx_4 +ad_connect axi_fmcomms11_gt/gt_tx_5 util_fmcomms11_gt/gt_tx_5 +ad_connect axi_fmcomms11_gt/gt_tx_6 util_fmcomms11_gt/gt_tx_6 +ad_connect axi_fmcomms11_gt/gt_tx_7 util_fmcomms11_gt/gt_tx_7 +ad_connect axi_fmcomms11_gt/gt_tx_ip_0 axi_ad9144_jesd/gt0_tx +ad_connect axi_fmcomms11_gt/gt_tx_ip_1 axi_ad9144_jesd/gt1_tx +ad_connect axi_fmcomms11_gt/gt_tx_ip_2 axi_ad9144_jesd/gt2_tx +ad_connect axi_fmcomms11_gt/gt_tx_ip_3 axi_ad9144_jesd/gt3_tx +ad_connect axi_fmcomms11_gt/gt_tx_ip_4 axi_ad9144_jesd/gt4_tx +ad_connect axi_fmcomms11_gt/gt_tx_ip_5 axi_ad9144_jesd/gt5_tx +ad_connect axi_fmcomms11_gt/gt_tx_ip_6 axi_ad9144_jesd/gt6_tx +ad_connect axi_fmcomms11_gt/gt_tx_ip_7 axi_ad9144_jesd/gt7_tx # connections (dac) -ad_connect util_daq2_gt/tx_sysref tx_sysref -ad_connect util_daq2_gt/tx_p tx_data_p -ad_connect util_daq2_gt/tx_n tx_data_n -ad_connect util_daq2_gt/tx_sync tx_sync -ad_connect util_daq2_gt/tx_out_clk util_daq2_gt/tx_clk -ad_connect util_daq2_gt/tx_out_clk axi_ad9144_jesd/tx_core_clk -ad_connect util_daq2_gt/tx_ip_rst axi_ad9144_jesd/tx_reset -ad_connect util_daq2_gt/tx_ip_rst_done axi_ad9144_jesd/tx_reset_done -ad_connect util_daq2_gt/tx_ip_sysref axi_ad9144_jesd/tx_sysref -ad_connect util_daq2_gt/tx_ip_sync axi_ad9144_jesd/tx_sync -ad_connect util_daq2_gt/tx_ip_data axi_ad9144_jesd/tx_tdata -ad_connect util_daq2_gt/tx_out_clk axi_ad9144_core/tx_clk -ad_connect util_daq2_gt/tx_data axi_ad9144_core/tx_data -ad_connect util_daq2_gt/tx_out_clk axi_ad9144_upack/dac_clk -ad_connect axi_ad9144_core/dac_enable_0 axi_ad9144_upack/dac_enable_0 -ad_connect axi_ad9144_core/dac_ddata_0 axi_ad9144_upack/dac_data_0 -ad_connect axi_ad9144_core/dac_valid_0 axi_ad9144_upack/dac_valid_0 -ad_connect axi_ad9144_core/dac_enable_1 axi_ad9144_upack/dac_enable_1 -ad_connect axi_ad9144_core/dac_ddata_1 axi_ad9144_upack/dac_data_1 -ad_connect axi_ad9144_core/dac_valid_1 axi_ad9144_upack/dac_valid_1 -ad_connect util_daq2_gt/tx_out_clk axi_ad9144_fifo/dac_clk -ad_connect axi_ad9144_upack/dac_valid axi_ad9144_fifo/dac_valid -ad_connect axi_ad9144_upack/dac_data axi_ad9144_fifo/dac_data -ad_connect axi_ad9144_upack/dma_xfer_in axi_ad9144_fifo/dac_xfer_out +ad_connect util_fmcomms11_gt/tx_sysref sysref +ad_connect util_fmcomms11_gt/tx_p tx_data_p +ad_connect util_fmcomms11_gt/tx_n tx_data_n +ad_connect util_fmcomms11_gt/tx_sync tx_sync +ad_connect util_fmcomms11_gt/tx_out_clk util_fmcomms11_gt/tx_clk +ad_connect util_fmcomms11_gt/tx_out_clk axi_ad9144_jesd/tx_core_clk +ad_connect util_fmcomms11_gt/tx_ip_rst axi_ad9144_jesd/tx_reset +ad_connect util_fmcomms11_gt/tx_ip_rst_done axi_ad9144_jesd/tx_reset_done +ad_connect util_fmcomms11_gt/tx_ip_sysref axi_ad9144_jesd/tx_sysref +ad_connect util_fmcomms11_gt/tx_ip_sync axi_ad9144_jesd/tx_sync +ad_connect util_fmcomms11_gt/tx_ip_data axi_ad9144_jesd/tx_tdata +ad_connect util_fmcomms11_gt/tx_out_clk axi_ad9144_core/tx_clk +ad_connect util_fmcomms11_gt/tx_data axi_ad9144_core/tx_data +ad_connect util_fmcomms11_gt/tx_out_clk axi_ad9144_fifo/dac_clk +ad_connect axi_ad9144_core/dac_valid_0 axi_ad9144_fifo/dac_valid +ad_connect axi_ad9144_core/dac_ddata_0 axi_ad9144_fifo/dac_data ad_connect sys_cpu_clk axi_ad9144_fifo/dma_clk ad_connect sys_cpu_reset axi_ad9144_fifo/dma_rst ad_connect sys_cpu_clk axi_ad9144_dma/m_axis_aclk @@ -155,67 +212,61 @@ ad_connect axi_ad9144_fifo/dma_xfer_last axi_ad9144_dma/m_axis_last # connections (adc) -ad_connect util_daq2_gt/rx_sysref rx_sysref -ad_connect util_daq2_gt/rx_p rx_data_p -ad_connect util_daq2_gt/rx_n rx_data_n -ad_connect util_daq2_gt/rx_sync rx_sync -ad_connect util_daq2_gt/rx_out_clk util_daq2_gt/rx_clk -ad_connect util_daq2_gt/rx_out_clk axi_ad9680_jesd/rx_core_clk -ad_connect util_daq2_gt/rx_ip_rst axi_ad9680_jesd/rx_reset -ad_connect util_daq2_gt/rx_ip_rst_done axi_ad9680_jesd/rx_reset_done -ad_connect util_daq2_gt/rx_ip_sysref axi_ad9680_jesd/rx_sysref -ad_connect util_daq2_gt/rx_ip_sync axi_ad9680_jesd/rx_sync -ad_connect util_daq2_gt/rx_ip_sof axi_ad9680_jesd/rx_start_of_frame -ad_connect util_daq2_gt/rx_ip_data axi_ad9680_jesd/rx_tdata -ad_connect util_daq2_gt/rx_out_clk axi_ad9680_core/rx_clk -ad_connect util_daq2_gt/rx_data axi_ad9680_core/rx_data -ad_connect util_daq2_gt/rx_out_clk axi_ad9680_cpack/adc_clk -ad_connect util_daq2_gt/rx_rst axi_ad9680_cpack/adc_rst -ad_connect axi_ad9680_core/adc_enable_0 axi_ad9680_cpack/adc_enable_0 -ad_connect axi_ad9680_core/adc_valid_0 axi_ad9680_cpack/adc_valid_0 -ad_connect axi_ad9680_core/adc_data_0 axi_ad9680_cpack/adc_data_0 -ad_connect axi_ad9680_core/adc_enable_1 axi_ad9680_cpack/adc_enable_1 -ad_connect axi_ad9680_core/adc_valid_1 axi_ad9680_cpack/adc_valid_1 -ad_connect axi_ad9680_core/adc_data_1 axi_ad9680_cpack/adc_data_1 -ad_connect util_daq2_gt/rx_out_clk axi_ad9680_fifo/adc_clk -ad_connect util_daq2_gt/rx_rst axi_ad9680_fifo/adc_rst -ad_connect axi_ad9680_cpack/adc_valid axi_ad9680_fifo/adc_wr -ad_connect axi_ad9680_cpack/adc_data axi_ad9680_fifo/adc_wdata -ad_connect sys_cpu_clk axi_ad9680_fifo/dma_clk -ad_connect sys_cpu_clk axi_ad9680_dma/s_axis_aclk -ad_connect sys_cpu_resetn axi_ad9680_dma/m_dest_axi_aresetn -ad_connect axi_ad9680_fifo/dma_wr axi_ad9680_dma/s_axis_valid -ad_connect axi_ad9680_fifo/dma_wdata axi_ad9680_dma/s_axis_data -ad_connect axi_ad9680_fifo/dma_wready axi_ad9680_dma/s_axis_ready -ad_connect axi_ad9680_fifo/dma_xfer_req axi_ad9680_dma/s_axis_xfer_req -ad_connect axi_ad9680_core/adc_dovf axi_ad9680_fifo/adc_wovf +ad_connect util_fmcomms11_gt/rx_sysref sysref +ad_connect util_fmcomms11_gt/rx_p rx_data_p +ad_connect util_fmcomms11_gt/rx_n rx_data_n +ad_connect util_fmcomms11_gt/rx_sync rx_sync +ad_connect util_fmcomms11_gt/rx_out_clk util_fmcomms11_gt/rx_clk +ad_connect util_fmcomms11_gt/rx_out_clk axi_ad9625_jesd/rx_core_clk +ad_connect util_fmcomms11_gt/rx_ip_rst axi_ad9625_jesd/rx_reset +ad_connect util_fmcomms11_gt/rx_ip_rst_done axi_ad9625_jesd/rx_reset_done +ad_connect util_fmcomms11_gt/rx_ip_sysref axi_ad9625_jesd/rx_sysref +ad_connect util_fmcomms11_gt/rx_ip_sync axi_ad9625_jesd/rx_sync +ad_connect util_fmcomms11_gt/rx_ip_sof axi_ad9625_jesd/rx_start_of_frame +ad_connect util_fmcomms11_gt/rx_ip_data axi_ad9625_jesd/rx_tdata +ad_connect util_fmcomms11_gt/rx_out_clk axi_ad9625_core/rx_clk +ad_connect util_fmcomms11_gt/rx_data axi_ad9625_core/rx_data +ad_connect axi_ad9625_core/adc_raddr_in GND +ad_connect axi_ad9625_core/adc_dunf GND +ad_connect util_fmcomms11_gt/rx_out_clk axi_ad9625_fifo/adc_clk +ad_connect util_fmcomms11_gt/rx_rst axi_ad9625_fifo/adc_rst +ad_connect axi_ad9625_core/adc_valid axi_ad9625_fifo/adc_wr +ad_connect axi_ad9625_core/adc_data axi_ad9625_fifo/adc_wdata +ad_connect sys_cpu_clk axi_ad9625_fifo/dma_clk +ad_connect sys_cpu_clk axi_ad9625_dma/s_axis_aclk +ad_connect sys_cpu_resetn axi_ad9625_dma/m_dest_axi_aresetn +ad_connect axi_ad9625_fifo/dma_wr axi_ad9625_dma/s_axis_valid +ad_connect axi_ad9625_fifo/dma_wdata axi_ad9625_dma/s_axis_data +ad_connect axi_ad9625_fifo/dma_wready axi_ad9625_dma/s_axis_ready +ad_connect axi_ad9625_fifo/dma_xfer_req axi_ad9625_dma/s_axis_xfer_req +ad_connect axi_ad9625_core/adc_dovf axi_ad9625_fifo/adc_wovf # interconnect (cpu) -ad_cpu_interconnect 0x44A60000 axi_daq2_gt +ad_cpu_interconnect 0x44A60000 axi_fmcomms11_gt ad_cpu_interconnect 0x44A00000 axi_ad9144_core ad_cpu_interconnect 0x44A90000 axi_ad9144_jesd ad_cpu_interconnect 0x7c420000 axi_ad9144_dma -ad_cpu_interconnect 0x44A10000 axi_ad9680_core -ad_cpu_interconnect 0x44A91000 axi_ad9680_jesd -ad_cpu_interconnect 0x7c400000 axi_ad9680_dma +ad_cpu_interconnect 0x44A10000 axi_ad9625_core +ad_cpu_interconnect 0x44A91000 axi_ad9625_jesd +ad_cpu_interconnect 0x7c400000 axi_ad9625_dma # gt uses hp3, and 100MHz clock for both DRP and AXI4 ad_mem_hp3_interconnect sys_cpu_clk sys_ps7/S_AXI_HP3 -ad_mem_hp3_interconnect sys_cpu_clk axi_daq2_gt/m_axi +ad_mem_hp3_interconnect sys_cpu_clk axi_fmcomms11_gt/m_axi # interconnect (mem/dac) ad_mem_hp1_interconnect sys_cpu_clk sys_ps7/S_AXI_HP1 ad_mem_hp1_interconnect sys_cpu_clk axi_ad9144_dma/m_src_axi ad_mem_hp2_interconnect sys_cpu_clk sys_ps7/S_AXI_HP2 -ad_mem_hp2_interconnect sys_cpu_clk axi_ad9680_dma/m_dest_axi +ad_mem_hp2_interconnect sys_cpu_clk axi_ad9625_dma/m_dest_axi # interrupts -ad_cpu_interrupt ps-12 mb-13 axi_ad9144_dma/irq -ad_cpu_interrupt ps-13 mb-12 axi_ad9680_dma/irq +ad_cpu_interrupt ps-12 mb-12 axi_ad9144_dma/irq +ad_cpu_interrupt ps-13 mb-13 axi_ad9625_dma/irq ad_connect axi_ad9144_core/dac_ddata_2 GND ad_connect axi_ad9144_core/dac_ddata_3 GND diff --git a/projects/fmcomms11/common/fmcomms11_spi.v b/projects/fmcomms11/common/fmcomms11_spi.v index 546948627..0a154cfd5 100644 --- a/projects/fmcomms11/common/fmcomms11_spi.v +++ b/projects/fmcomms11/common/fmcomms11_spi.v @@ -39,25 +39,23 @@ module fmcomms11_spi ( - spi_csn, - spi_clk, - spi_mosi, - spi_miso, - - spi_sdio, - spi_dir); - // 4 wire - input [ 2:0] spi_csn; - input spi_clk; - input spi_mosi; - output spi_miso; + input [ 2:0] spi_csn, + input spi_clk, + input spi_mosi, + output spi_miso, // 3 wire - inout spi_sdio; - output spi_dir; + output spi_csn_ad9625, + output spi_csn_ad9162, + output spi_csn_ad9508, + output spi_csn_adl5240, + output spi_csn_adf4355, + output spi_csn_hmc1119, + inout spi_sdio, + output spi_dir); // internal registers @@ -67,12 +65,27 @@ module fmcomms11_spi ( // internal signals + wire [ 5:0] spi_csn6_s; wire spi_csn_s; wire spi_enable_s; // check on rising edge and change on falling edge - assign spi_csn_s = & spi_csn; + assign spi_csn_ad9625 = spi_csn6_s[0]; + assign spi_csn_ad9162 = spi_csn6_s[1]; + assign spi_csn_ad9508 = spi_csn6_s[2]; + assign spi_csn_adl5240 = spi_csn6_s[3]; + assign spi_csn_adf4355 = spi_csn6_s[4]; + assign spi_csn_hmc1119 = spi_csn6_s[5]; + + assign spi_csn6_s[0] = (spi_csn == 3'b001) ? 1'b0 : 1'b1; + assign spi_csn6_s[1] = (spi_csn == 3'b010) ? 1'b0 : 1'b1; + assign spi_csn6_s[2] = (spi_csn == 3'b011) ? 1'b0 : 1'b1; + assign spi_csn6_s[3] = (spi_csn == 3'b100) ? 1'b0 : 1'b1; + assign spi_csn6_s[4] = (spi_csn == 3'b101) ? 1'b0 : 1'b1; + assign spi_csn6_s[5] = (spi_csn == 3'b110) ? 1'b0 : 1'b1; + + assign spi_csn_s = & spi_csn6_s; assign spi_dir = ~spi_enable_s; assign spi_enable_s = spi_enable & ~spi_csn_s; @@ -98,7 +111,7 @@ module fmcomms11_spi ( end end - // io butter + // io buffer assign spi_miso = spi_sdio; assign spi_sdio = (spi_enable_s == 1'b1) ? 1'bz : spi_mosi;