From ff2dfa7dd301c8f0af4e14e2802c83102942257e Mon Sep 17 00:00:00 2001 From: Adrian Costina Date: Wed, 18 Mar 2015 12:59:52 +0200 Subject: [PATCH] fmcadc5: Updated project with interrupts in IPI to work correctly in Linux --- projects/fmcadc5/common/fmcadc5_bd.tcl | 17 +++++++++-------- projects/fmcadc5/vc707/system_top.v | 6 ------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/projects/fmcadc5/common/fmcadc5_bd.tcl b/projects/fmcadc5/common/fmcadc5_bd.tcl index 39cb384b1..167d440a0 100644 --- a/projects/fmcadc5/common/fmcadc5_bd.tcl +++ b/projects/fmcadc5/common/fmcadc5_bd.tcl @@ -21,10 +21,6 @@ set rx_sync_1 [create_bd_port -dir O rx_sync_1] set rx_sysref [create_bd_port -dir O rx_sysref] -set ad9625_spi_intr [create_bd_port -dir O ad9625_spi_intr] -set ad9625_gpio_intr [create_bd_port -dir O ad9625_gpio_intr] -set ad9625_dma_intr [create_bd_port -dir O ad9625_dma_intr] - set gpio_ad9625_i [create_bd_port -dir I -from 18 -to 0 gpio_ad9625_i] set gpio_ad9625_o [create_bd_port -dir O -from 18 -to 0 gpio_ad9625_o] set gpio_ad9625_t [create_bd_port -dir O -from 18 -to 0 gpio_ad9625_t] @@ -120,9 +116,6 @@ connect_bd_net -net gpio_ad9625_i [get_bd_ports gpio_ad9625_i] [get_bd_pins connect_bd_net -net gpio_ad9625_o [get_bd_ports gpio_ad9625_o] [get_bd_pins axi_ad9625_gpio/gpio_io_o] connect_bd_net -net gpio_ad9625_t [get_bd_ports gpio_ad9625_t] [get_bd_pins axi_ad9625_gpio/gpio_io_t] -connect_bd_net -net axi_ad9625_spi_irq [get_bd_pins axi_ad9625_spi/ip2intc_irpt] [get_bd_ports ad9625_spi_intr] -connect_bd_net -net axi_ad9625_gpio_irq [get_bd_pins axi_ad9625_gpio/ip2intc_irpt] [get_bd_ports ad9625_gpio_intr] - # connections (gt) connect_bd_net -net axi_ad9625_0_gt_ref_clk_c [get_bd_pins axi_ad9625_0_gt/ref_clk_c] [get_bd_ports rx_ref_clk_0] @@ -191,7 +184,15 @@ connect_bd_net -net axi_ad9625_dma_dvalid [get_bd_pins axi_ad9625_fi connect_bd_net -net axi_ad9625_dma_dready [get_bd_pins axi_ad9625_fifo/dma_wready] [get_bd_pins axi_ad9625_dma/s_axis_ready] connect_bd_net -net axi_ad9625_dma_ddata [get_bd_pins axi_ad9625_fifo/dma_wdata] [get_bd_pins axi_ad9625_dma/s_axis_data] connect_bd_net -net axi_ad9625_dma_xfer_req [get_bd_pins axi_ad9625_fifo/dma_xfer_req] [get_bd_pins axi_ad9625_dma/s_axis_xfer_req] -connect_bd_net -net axi_ad9625_dma_intr [get_bd_pins axi_ad9625_dma/irq] [get_bd_ports ad9625_dma_intr] + +# interrupts + +delete_bd_objs [get_bd_nets mb_intr_11_s] [get_bd_ports mb_intr_11] +delete_bd_objs [get_bd_nets mb_intr_12_s] [get_bd_ports mb_intr_12] +delete_bd_objs [get_bd_nets mb_intr_13_s] [get_bd_ports mb_intr_13] +connect_bd_net -net axi_ad9625_spi_irq [get_bd_pins axi_ad9625_spi/ip2intc_irpt] [get_bd_pins sys_concat_intc/In11] +connect_bd_net -net axi_ad9625_gpio_irq [get_bd_pins axi_ad9625_gpio/ip2intc_irpt] [get_bd_pins sys_concat_intc/In12] +connect_bd_net -net axi_ad9625_dma_intr [get_bd_pins axi_ad9625_dma/irq] [get_bd_pins sys_concat_intc/In13] # interconnect (cpu) diff --git a/projects/fmcadc5/vc707/system_top.v b/projects/fmcadc5/vc707/system_top.v index be403784d..add526744 100644 --- a/projects/fmcadc5/vc707/system_top.v +++ b/projects/fmcadc5/vc707/system_top.v @@ -384,9 +384,6 @@ module system_top ( assign fan_pwm = 1'b1; system_wrapper i_system_wrapper ( - .ad9625_dma_intr (mb_intrs[13]), - .ad9625_gpio_intr (mb_intrs[12]), - .ad9625_spi_intr (mb_intrs[11]), .adc_clk (adc_clk), .adc_data_0 (adc_data_0), .adc_data_1 (adc_data_1), @@ -432,9 +429,6 @@ module system_top ( .iic_main_sda_io (iic_sda), .iic_rstn (iic_rstn), .mb_intr_10 (mb_intrs[10]), - .mb_intr_11 (mb_intrs[11]), - .mb_intr_12 (mb_intrs[12]), - .mb_intr_13 (mb_intrs[13]), .mb_intr_14 (mb_intrs[14]), .mb_intr_15 (mb_intrs[15]), .mb_intr_16 (mb_intrs[16]),