axi_*: Fix instantiation of up_[adc|dac]_[common|channel]

A couple of new parameters and new ports are missing in several up_[adc|dac]_[common|channel] instance, and generates warnings. The rule of thumb is to use full instantiations, defining all the existing parameter and ports of the module. Fix all the instantiation of up_[adc|dac]_[common|channel], by defining all its parameters and ports.
analogdevicesinc · Apr 11, 2018 · 493fc1d · 493fc1d
1 parent 74b922f
commit 493fc1d
Show file tree

Hide file tree

Showing 32 changed files with 255 additions and 35 deletions.
diff --git a/library/axi_ad5766/axi_ad5766.v b/library/axi_ad5766/axi_ad5766.v
@@ -342,7 +342,12 @@ module axi_ad5766 #(
     .up_rack (up_rack_s[1]));
 
   up_dac_common #(
-    .COMMON_ID (0)
+    .COMMON_ID (0),
+    .CONFIG (0),
+    .CLK_EDGE_SEL (0),
+    .DRP_DISABLE (6'h00),
+    .USERPORTS_DISABLE (0),
+    .GPIO_DISABLE (0)
   ) i_dac_common (
     .mmcm_rst (),
     .dac_clk (spi_clk),
@@ -355,11 +360,14 @@ module axi_ad5766 #(
     .dac_r1_mode (),
     .dac_datafmt (dac_datafmt),
     .dac_datarate (dac_datarate_s),
-    .dac_status (),
-    .dac_status_ovf (),
+    .dac_status (1'b0),
+    .dac_status_ovf (1'b0),
     .dac_status_unf (dma_underflow),
     .dac_clk_ratio (32'b0),
     .up_dac_ce (),
+    .up_pps_rcounter (32'b0),
+    .up_pps_status (1'b0),
+    .up_pps_irq_mask (),
     .up_drp_sel (),
     .up_drp_wr (),
     .up_drp_addr (),

diff --git a/library/axi_ad6676/axi_ad6676.v b/library/axi_ad6676/axi_ad6676.v
@@ -213,7 +213,15 @@ module axi_ad6676 #(
 
   // common processor control
 
-  up_adc_common #(.ID(ID)) i_up_adc_common (
+  up_adc_common #(
+    .ID(ID),
+    .CONFIG(0),
+    .COMMON_ID(6'h00),
+    .DRP_DISABLE(1),
+    .USERPORTS_DISABLE(1),
+    .GPIO_DISABLE(1),
+    .START_CODE_DISABLE(1))
+  i_up_adc_common (
     .mmcm_rst (),
     .adc_clk (adc_clk),
     .adc_rst (adc_rst),
@@ -228,6 +236,9 @@ module axi_ad6676 #(
     .adc_start_code (),
     .adc_sref_sync (),
     .adc_sync (),
+    .up_pps_rcounter(32'h0),
+    .up_pps_status(1'b0),
+    .up_pps_irq_mask(),
     .up_adc_ce (),
     .up_status_pn_err (up_status_pn_err),
     .up_status_pn_oos (up_status_pn_oos),

diff --git a/library/axi_ad6676/axi_ad6676_channel.v b/library/axi_ad6676/axi_ad6676_channel.v
@@ -86,7 +86,14 @@ module axi_ad6676_channel #(
 
   assign adc_dfmt_data = adc_data;
 
-  up_adc_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel (
+  up_adc_channel #(
+    .CHANNEL_ID(CHANNEL_ID),
+    .COMMON_ID(6'h01),
+    .USERPORTS_DISABLE(1),
+    .DATAFORMAT_DISABLE(1),
+    .DCFILTER_DISABLE(1),
+    .IQCORRECTION_DISABLE(1))
+  i_up_adc_channel (
     .adc_clk (adc_clk),
     .adc_rst (adc_rst),
     .adc_enable (adc_enable),

diff --git a/library/axi_ad9122/axi_ad9122_channel.v b/library/axi_ad9122/axi_ad9122_channel.v
@@ -209,7 +209,13 @@ module axi_ad9122_channel #(
 
   // single channel processor
 
-  up_dac_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_dac_channel (
+  up_dac_channel #(
+    .COMMON_ID (6'h11),
+    .CHANNEL_ID(CHANNEL_ID),
+    .DDS_DISABLE (0),
+    .USERPORTS_DISABLE (0),
+    .IQCORRECTION_DISABLE (0))
+  i_up_dac_channel (
     .dac_clk (dac_div_clk),
     .dac_rst (dac_rst),
     .dac_dds_scale_1 (dac_dds_scale_1_s),

diff --git a/library/axi_ad9122/axi_ad9122_core.v b/library/axi_ad9122/axi_ad9122_core.v
@@ -200,7 +200,15 @@ module axi_ad9122_core #(
 
   // dac common processor interface
 
-  up_dac_common #(.ID(ID)) i_up_dac_common (
+  up_dac_common #(
+    .ID(ID),
+    .CONFIG (0),
+    .CLK_EDGE_SEL (0),
+    .COMMON_ID (6'h10),
+    .DRP_DISABLE (6'h00),
+    .USERPORTS_DISABLE (0),
+    .GPIO_DISABLE (0))
+  i_up_dac_common (
     .mmcm_rst (mmcm_rst),
     .dac_clk (dac_div_clk),
     .dac_rst (dac_rst),
@@ -217,6 +225,9 @@ module axi_ad9122_core #(
     .dac_status_unf (dac_dunf),
     .dac_clk_ratio (32'd4),
     .up_dac_ce (),
+    .up_pps_rcounter(32'd0),
+    .up_pps_status(1'd0),
+    .up_pps_irq_mask(),
     .up_drp_sel (up_drp_sel),
     .up_drp_wr (up_drp_wr),
     .up_drp_addr (up_drp_addr),

diff --git a/library/axi_ad9152/axi_ad9152_channel.v b/library/axi_ad9152/axi_ad9152_channel.v
@@ -379,7 +379,13 @@ module axi_ad9152_channel #(
 
   // single channel processor
 
-  up_dac_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_dac_channel (
+  up_dac_channel #(
+    .COMMON_ID (6'h11),
+    .CHANNEL_ID(CHANNEL_ID),
+    .DDS_DISABLE (0),
+    .USERPORTS_DISABLE (0),
+    .IQCORRECTION_DISABLE (0))
+  i_up_dac_channel (
     .dac_clk (dac_clk),
     .dac_rst (dac_rst),
     .dac_dds_scale_1 (dac_dds_scale_1_s),

diff --git a/library/axi_ad9152/axi_ad9152_core.v b/library/axi_ad9152/axi_ad9152_core.v
@@ -159,7 +159,15 @@ module axi_ad9152_core #(
 
   // dac common processor interface
 
-  up_dac_common #(.ID(ID)) i_up_dac_common (
+  up_dac_common #(
+    .ID(ID),
+    .CONFIG (0),
+    .CLK_EDGE_SEL (0),
+    .COMMON_ID (6'h10),
+    .DRP_DISABLE (6'h00),
+    .USERPORTS_DISABLE (0),
+    .GPIO_DISABLE (0))
+  i_up_dac_common (
     .mmcm_rst (),
     .dac_clk (dac_clk),
     .dac_rst (dac_rst),
@@ -176,6 +184,9 @@ module axi_ad9152_core #(
     .dac_status_unf (dac_dunf),
     .dac_clk_ratio (32'd4),
     .up_dac_ce (),
+    .up_pps_rcounter(32'd0),
+    .up_pps_status(1'd0),
+    .up_pps_irq_mask(),
     .up_drp_sel (),
     .up_drp_wr (),
     .up_drp_addr (),

diff --git a/library/axi_ad9162/axi_ad9162_core.v b/library/axi_ad9162/axi_ad9162_core.v
@@ -122,7 +122,15 @@ module axi_ad9162_core #(
 
   // dac common processor interface
 
-  up_dac_common #(.ID(ID)) i_up_dac_common (
+  up_dac_common #(
+    .ID (ID),
+    .CONFIG (0),
+    .CLK_EDGE_SEL (1'b0),
+    .COMMON_ID (6'h10),
+    .DRP_DISABLE (0),
+    .USERPORTS_DISABLE (0),
+    .GPIO_DISABLE (0))
+  i_up_dac_common (
     .mmcm_rst (),
     .dac_clk (dac_clk),
     .dac_rst (dac_rst),
@@ -139,6 +147,9 @@ module axi_ad9162_core #(
     .dac_status_unf (dac_dunf),
     .dac_clk_ratio (32'd16),
     .up_dac_ce (),
+    .up_pps_rcounter (32'd0),
+    .up_pps_status (1'd0),
+    .up_pps_irq_mask (),
     .up_drp_sel (),
     .up_drp_wr (),
     .up_drp_addr (),

diff --git a/library/axi_ad9265/axi_ad9265.v b/library/axi_ad9265/axi_ad9265.v
@@ -224,7 +224,15 @@ module axi_ad9265 #(
 
   // common processor control
 
-  up_adc_common #(.ID(ID)) i_up_adc_common (
+  up_adc_common #(
+    .ID(ID),
+    .CONFIG (0),
+    .COMMON_ID (6'h00),
+    .DRP_DISABLE (6'h00),
+    .USERPORTS_DISABLE (0),
+    .GPIO_DISABLE (0),
+    .START_CODE_DISABLE(0))
+  i_up_adc_common (
     .mmcm_rst (),
     .adc_clk (adc_clk),
     .adc_rst (adc_rst),
@@ -239,6 +247,9 @@ module axi_ad9265 #(
     .adc_start_code (),
     .adc_sref_sync (),
     .adc_sync (),
+    .up_pps_rcounter(32'd0),
+    .up_pps_status(1'd0),
+    .up_pps_irq_mask(),
     .up_adc_ce (),
     .up_status_pn_err (up_status_pn_err),
     .up_status_pn_oos (up_status_pn_oos),

diff --git a/library/axi_ad9265/axi_ad9265_channel.v b/library/axi_ad9265/axi_ad9265_channel.v
@@ -125,7 +125,14 @@ module axi_ad9265_channel #(
   end
   endgenerate
 
-  up_adc_channel #(.CHANNEL_ID(CHANNEL_ID)) i_up_adc_channel (
+  up_adc_channel #(
+    .COMMON_ID (6'h01),
+    .CHANNEL_ID(CHANNEL_ID),
+    .USERPORTS_DISABLE (0),
+    .DATAFORMAT_DISABLE (0),
+    .DCFILTER_DISABLE (0),
+    .IQCORRECTION_DISABLE (0))
+  i_up_adc_channel (
     .adc_clk (adc_clk),
     .adc_rst (adc_rst),
     .adc_enable (adc_enable),

diff --git a/library/axi_ad9361/axi_ad9361_rx.v b/library/axi_ad9361/axi_ad9361_rx.v
@@ -336,7 +336,9 @@ module axi_ad9361_rx #(
     .ID (ID),
     .CONFIG (CONFIG),
     .DRP_DISABLE (1),
-    .USERPORTS_DISABLE (USERPORTS_DISABLE))
+    .USERPORTS_DISABLE (USERPORTS_DISABLE),
+    .GPIO_DISABLE (0),
+    .START_CODE_DISABLE (0))
   i_up_adc_common (
     .mmcm_rst (mmcm_rst),
     .adc_clk (adc_clk),

diff --git a/library/axi_ad9361/axi_ad9361_tx.v b/library/axi_ad9361/axi_ad9361_tx.v
@@ -343,7 +343,8 @@ module axi_ad9361_tx #(
     .CONFIG (CONFIG),
     .CLK_EDGE_SEL (CLK_EDGE_SEL),
     .DRP_DISABLE (1),
-    .USERPORTS_DISABLE (USERPORTS_DISABLE))
+    .USERPORTS_DISABLE (USERPORTS_DISABLE),
+    .GPIO_DISABLE (0))
   i_up_dac_common (
     .mmcm_rst (),
     .dac_clk (dac_clk),

diff --git a/library/axi_ad9361/axi_ad9361_tx_channel.v b/library/axi_ad9361/axi_ad9361_tx_channel.v
@@ -354,6 +354,7 @@ module axi_ad9361_tx_channel #(
   assign up_rdata = (DISABLE == 1) ? 32'd0 : up_rdata_s;
 
   up_dac_channel #(
+    .COMMON_ID (6'h11),
     .CHANNEL_ID (CHANNEL_ID),
     .DDS_DISABLE (DDS_DISABLE),
     .USERPORTS_DISABLE (USERPORTS_DISABLE),

diff --git a/library/axi_ad9371/axi_ad9371_rx.v b/library/axi_ad9371/axi_ad9371_rx.v
@@ -255,7 +255,12 @@ module axi_ad9371_rx #(
 
   up_adc_common #(
     .COMMON_ID ('h00),
-    .ID (ID))
+    .ID (ID),
+    .CONFIG (0),
+    .DRP_DISABLE (0),
+    .USERPORTS_DISABLE (0),
+    .GPIO_DISABLE (0),
+    .START_CODE_DISABLE (0))
   i_up_adc_common (
     .mmcm_rst (),
     .adc_clk (adc_clk),
@@ -271,6 +276,9 @@ module axi_ad9371_rx #(
     .adc_start_code (),
     .adc_sref_sync (),
     .adc_sync (),
+    .up_pps_rcounter (31'b0),
+    .up_pps_status (1'b1),
+    .up_pps_irq_mask (),
     .up_adc_ce (),
     .up_status_pn_err (up_status_pn_err),
     .up_status_pn_oos (up_status_pn_oos),

diff --git a/library/axi_ad9379/axi_ad9379_rx.v b/library/axi_ad9379/axi_ad9379_rx.v
@@ -254,8 +254,13 @@ module axi_ad9379_rx #(
   // common processor control
 
   up_adc_common #(
-    .COMMON_ID ('h00),
-    .ID (ID))
+    .COMMON_ID (6'h00),
+    .ID (ID),
+    .CONFIG(0),
+    .DRP_DISABLE(1),
+    .USERPORTS_DISABLE(1),
+    .GPIO_DISABLE(1),
+    .START_CODE_DISABLE(1))
   i_up_adc_common (
     .mmcm_rst (),
     .adc_clk (adc_clk),

diff --git a/library/axi_ad9379/axi_ad9379_rx_channel.v b/library/axi_ad9379/axi_ad9379_rx_channel.v
@@ -168,7 +168,11 @@ module axi_ad9379_rx_channel #(
 
   up_adc_channel #(
     .COMMON_ID (COMMON_ID),
-    .CHANNEL_ID (CHANNEL_ID))
+    .CHANNEL_ID (CHANNEL_ID),
+    .USERPORTS_DISABLE(1),
+    .DATAFORMAT_DISABLE(DATAPATH_DISABLE),
+    .DCFILTER_DISABLE(DATAPATH_DISABLE),
+    .IQCORRECTION_DISABLE(DATAPATH_DISABLE))
   i_up_adc_channel (
     .adc_clk (adc_clk),
     .adc_rst (adc_rst),

diff --git a/library/axi_ad9379/axi_ad9379_tx.v b/library/axi_ad9379/axi_ad9379_tx.v
@@ -241,7 +241,15 @@ module axi_ad9379_tx #(
 
   // dac common processor interface
 
-  up_dac_common #(.ID (ID)) i_up_dac_common (
+  up_dac_common #(
+    .ID (ID),
+    .CONFIG(0),
+    .CLK_EDGE_SEL(0),
+    .COMMON_ID(6'h10),
+    .DRP_DISABLE(1),
+    .USERPORTS_DISABLE(1),
+    .GPIO_DISABLE(1))
+  i_up_dac_common (
     .mmcm_rst (),
     .dac_clk (dac_clk),
     .dac_rst (dac_rst),

diff --git a/library/axi_ad9379/axi_ad9379_tx_channel.v b/library/axi_ad9379/axi_ad9379_tx_channel.v
@@ -204,7 +204,13 @@ module axi_ad9379_tx_channel #(
 
   // single channel processor
 
-  up_dac_channel #(.CHANNEL_ID (CHANNEL_ID)) i_up_dac_channel (
+  up_dac_channel #(
+    .COMMON_ID(6'h11),
+    .CHANNEL_ID (CHANNEL_ID),
+    .DDS_DISABLE(DATAPATH_DISABLE),
+    .USERPORTS_DISABLE(1),
+    .IQCORRECTION_DISABLE(DATAPATH_DISABLE))
+    i_up_dac_channel (
     .dac_clk (dac_clk),
     .dac_rst (dac_rst),
     .dac_dds_scale_1 (dac_dds_scale_1_s),

diff --git a/library/axi_ad9434/axi_ad9434_core.v b/library/axi_ad9434/axi_ad9434_core.v
@@ -89,9 +89,6 @@ module axi_ad9434_core #(
   output                  adc_rst,
   input                   adc_status);
 
-
-  // internal registers
-
   // internal signals
   wire            up_status_pn_err_s;
   wire            up_status_pn_oos_s;
@@ -149,7 +146,13 @@ module axi_ad9434_core #(
   end
 
   up_adc_common #(
-    .ID(ID))
+    .ID(ID),
+    .CONFIG(0),
+    .COMMON_ID(0),
+    .DRP_DISABLE(0),
+    .USERPORTS_DISABLE(1),
+    .GPIO_DISABLE(1),
+    .START_CODE_DISABLE(1))
   i_adc_common(
     .mmcm_rst (mmcm_rst),
 
@@ -167,6 +170,10 @@ module axi_ad9434_core #(
     .adc_sref_sync (),
     .adc_sync (),
 
+    .up_pps_rcounter(32'h0),
+    .up_pps_status(1'b0),
+    .up_pps_irq_mask(),
+
     .up_adc_ce (),
     .up_status_pn_err (up_status_pn_err_s),
     .up_status_pn_oos (up_status_pn_oos_s),
@@ -197,7 +204,11 @@ module axi_ad9434_core #(
     .up_rack (up_rack_s[0]));
 
   up_adc_channel #(
-    .CHANNEL_ID(0))
+    .CHANNEL_ID(0),
+    .USERPORTS_DISABLE(1),
+    .DATAFORMAT_DISABLE(0),
+    .DCFILTER_DISABLE(1),
+    .IQCORRECTION_DISABLE(1))
   i_adc_channel(
     .adc_clk (adc_clk),
     .adc_rst (adc_rst),