diff --git a/projects/ad469x_fmc/common/ad469x_qsys.tcl b/projects/ad469x_fmc/common/ad469x_qsys.tcl index 024a5e6eba4..49135abb0a8 100644 --- a/projects/ad469x_fmc/common/ad469x_qsys.tcl +++ b/projects/ad469x_fmc/common/ad469x_qsys.tcl @@ -80,9 +80,10 @@ set_interface_property ad469x_spi_trigger EXPORT_OF spi_engine_offload_0.if_trig set_interface_property ad469x_spi_cnv EXPORT_OF ad469x_trigger_gen.if_pwm_0 set_interface_property ad469x_spi_resetn EXPORT_OF reset_bridge_0.out_reset - add_connection axi_spi_engine_0.if_spi_resetn reset_bridge_0.in_reset +set_interface_property dmac_s_axi_xfer_req EXPORT_OF axi_dmac_0.s_axi_xfer_req + # clocks add_interface ad469x_spi_clk clock source diff --git a/projects/ad469x_fmc/de10nano/system_top.v b/projects/ad469x_fmc/de10nano/system_top.v index ab064ef54a3..834a808f964 100644 --- a/projects/ad469x_fmc/de10nano/system_top.v +++ b/projects/ad469x_fmc/de10nano/system_top.v @@ -153,19 +153,25 @@ module system_top #( wire i2c0_scl_in_clk; wire ad469x_spi_cnv_s; + wire ad469x_spi_cnv_s_int; + wire ad469x_spi_cnv_s_int2; wire ad469x_spi_cs_s; +wire dmac_s_axi_xfer_req; wire spi_trigger; wire spi_clk_s; wire spi_resetn; wire spi_trigger_ed; - assign ad469x_spi_cnv = (SPI_4WIRE == 0) ? ad469x_spi_cnv_s : ad469x_spi_cs_s; +assign ad469x_spi_cnv_s_int2 = (ad469x_spi_cnv_s_int & dmac_s_axi_xfer_req) | gpio_o[35]; + + + assign ad469x_spi_cnv = (SPI_4WIRE == 0) ? ad469x_spi_cnv_s_int2 : ad469x_spi_cs_s; assign ad469x_spi_cs = ad469x_spi_cs_s; // adc control gpio assign - assign gpio_i[63:35] = gpio_o[63:35]; + assign gpio_i[63:36] = gpio_o[63:36]; assign gpio_i[31:15] = gpio_o[31:15]; assign ltc2308_cs = gpio_o[34]; @@ -291,14 +297,15 @@ module system_top #( .sys_gpio_in_export (gpio_i[63:32]), .sys_gpio_out_export (gpio_o[63:32]), - .ad469x_spi_cs_cs (ad469x_spi_csn), + .ad469x_spi_cs_cs (ad469x_spi_cs_s), .ad469x_spi_sclk_clk (ad469x_spi_clk), .ad469x_spi_sdi_sdi (ad469x_spi_miso), .ad469x_spi_sdo_sdo (ad469x_spi_mosi), .ad469x_spi_resetn_reset_n (spi_resetn), .ad469x_spi_clk_clk (spi_clk_s), + .dmac_s_axi_xfer_req(dmac_s_axi_xfer_req), // .ad469x_spi_busy(ad469x_busy_alt_gp0), - .ad469x_spi_cnv_if_pwm (ad469x_spi_cnv_s), + .ad469x_spi_cnv_if_pwm (ad469x_spi_cnv_s_int), .sys_spi_MISO (1'b0), .sys_spi_MOSI (),