axi_ad9122: Update core to the new DRP interface

main
Istvan Csomortani 2016-09-21 16:09:55 +03:00
parent bae839acd4
commit 64cd7dc002
4 changed files with 39 additions and 34 deletions

View File

@ -187,8 +187,8 @@ module axi_ad9122 (
wire up_drp_sel_s; wire up_drp_sel_s;
wire up_drp_wr_s; wire up_drp_wr_s;
wire [11:0] up_drp_addr_s; wire [11:0] up_drp_addr_s;
wire [15:0] up_drp_wdata_s; wire [31:0] up_drp_wdata_s;
wire [15:0] up_drp_rdata_s; wire [31:0] up_drp_rdata_s;
wire up_drp_ready_s; wire up_drp_ready_s;
wire up_drp_locked_s; wire up_drp_locked_s;
wire up_wreq_s; wire up_wreq_s;

View File

@ -156,8 +156,8 @@ module axi_ad9122_core (
output up_drp_sel; output up_drp_sel;
output up_drp_wr; output up_drp_wr;
output [11:0] up_drp_addr; output [11:0] up_drp_addr;
output [15:0] up_drp_wdata; output [31:0] up_drp_wdata;
input [15:0] up_drp_rdata; input [31:0] up_drp_rdata;
input up_drp_ready; input up_drp_ready;
input up_drp_locked; input up_drp_locked;

View File

@ -156,8 +156,8 @@ module axi_ad9122_if (
input up_drp_sel; input up_drp_sel;
input up_drp_wr; input up_drp_wr;
input [11:0] up_drp_addr; input [11:0] up_drp_addr;
input [15:0] up_drp_wdata; input [31:0] up_drp_wdata;
output [15:0] up_drp_rdata; output [31:0] up_drp_rdata;
output up_drp_ready; output up_drp_ready;
output up_drp_locked; output up_drp_locked;
@ -186,12 +186,13 @@ module axi_ad9122_if (
ad_serdes_out #( ad_serdes_out #(
.DEVICE_TYPE (DEVICE_TYPE), .DEVICE_TYPE (DEVICE_TYPE),
.SERDES_OR_DDR_N (SERDES_OR_DDR_N), .DDR_OR_SDR_N (SERDES_OR_DDR_N),
.DATA_WIDTH (16)) .DATA_WIDTH (16))
i_serdes_out_data ( i_serdes_out_data (
.rst (dac_rst), .rst (dac_rst),
.clk (dac_clk), .clk (dac_clk),
.div_clk (dac_div_clk), .div_clk (dac_div_clk),
.loaden (1'b0),
.data_s0 (dac_data_i0), .data_s0 (dac_data_i0),
.data_s1 (dac_data_q0), .data_s1 (dac_data_q0),
.data_s2 (dac_data_i1), .data_s2 (dac_data_i1),
@ -207,12 +208,13 @@ module axi_ad9122_if (
ad_serdes_out #( ad_serdes_out #(
.DEVICE_TYPE (DEVICE_TYPE), .DEVICE_TYPE (DEVICE_TYPE),
.SERDES_OR_DDR_N (SERDES_OR_DDR_N), .DDR_OR_SDR_N (SERDES_OR_DDR_N),
.DATA_WIDTH (1)) .DATA_WIDTH (1))
i_serdes_out_frame ( i_serdes_out_frame (
.rst (dac_rst), .rst (dac_rst),
.clk (dac_clk), .clk (dac_clk),
.div_clk (dac_div_clk), .div_clk (dac_div_clk),
.loaden (1'b0),
.data_s0 (dac_frame_i0), .data_s0 (dac_frame_i0),
.data_s1 (dac_frame_q0), .data_s1 (dac_frame_q0),
.data_s2 (dac_frame_i1), .data_s2 (dac_frame_i1),
@ -228,12 +230,13 @@ module axi_ad9122_if (
ad_serdes_out #( ad_serdes_out #(
.DEVICE_TYPE (DEVICE_TYPE), .DEVICE_TYPE (DEVICE_TYPE),
.SERDES_OR_DDR_N (SERDES_OR_DDR_N), .DDR_OR_SDR_N (SERDES_OR_DDR_N),
.DATA_WIDTH (1)) .DATA_WIDTH (1))
i_serdes_out_clk ( i_serdes_out_clk (
.rst (dac_rst), .rst (dac_rst),
.clk (dac_out_clk), .clk (dac_out_clk),
.div_clk (dac_div_clk), .div_clk (dac_div_clk),
.loaden (1'b0),
.data_s0 (1'b1), .data_s0 (1'b1),
.data_s1 (1'b0), .data_s1 (1'b0),
.data_s2 (1'b1), .data_s2 (1'b1),
@ -248,21 +251,23 @@ module axi_ad9122_if (
// dac clock input buffers // dac clock input buffers
ad_serdes_clk #( ad_serdes_clk #(
.SERDES_OR_DDR_N (SERDES_OR_DDR_N), .DDR_OR_SDR_N (SERDES_OR_DDR_N),
.MMCM_OR_BUFR_N (MMCM_OR_BUFIO_N), .MMCM_OR_BUFR_N (MMCM_OR_BUFIO_N),
.MMCM_DEVICE_TYPE (DEVICE_TYPE), .DEVICE_TYPE (DEVICE_TYPE),
.MMCM_CLKIN_PERIOD (MMCM_CLKIN_PERIOD), .MMCM_CLKIN_PERIOD (MMCM_CLKIN_PERIOD),
.MMCM_VCO_DIV (MMCM_VCO_DIV), .MMCM_VCO_DIV (MMCM_VCO_DIV),
.MMCM_VCO_MUL (MMCM_VCO_MUL), .MMCM_VCO_MUL (MMCM_VCO_MUL),
.MMCM_CLK0_DIV (MMCM_CLK0_DIV), .MMCM_CLK0_DIV (MMCM_CLK0_DIV),
.MMCM_CLK1_DIV (MMCM_CLK1_DIV)) .MMCM_CLK1_DIV (MMCM_CLK1_DIV))
i_serdes_clk ( i_serdes_clk (
.mmcm_rst (mmcm_rst), .rst (mmcm_rst),
.clk_in_p (dac_clk_in_p), .clk_in_p (dac_clk_in_p),
.clk_in_n (dac_clk_in_n), .clk_in_n (dac_clk_in_n),
.clk (dac_clk), .clk (dac_clk),
.div_clk (dac_div_clk), .div_clk (dac_div_clk),
.out_clk (dac_out_clk), .out_clk (dac_out_clk),
.loaden (),
.phase (),
.up_clk (up_clk), .up_clk (up_clk),
.up_rstn (up_rstn), .up_rstn (up_rstn),
.up_drp_sel (up_drp_sel), .up_drp_sel (up_drp_sel),