zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jesd204_tpl: addresses cleanup 

The TPL has an address space of 12 bits while the legacy subcomponents
have 16 bits. Update the module for a better readability.
main
Laszlo Nagy 2019-01-17 13:16:45 +00:00 committed by Laszlo Nagy
parent 560e9b9e52
commit cf593d5a40
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/jesd204/ad_ip_jesd204_tpl_adc/ad_ip_jesd204_tpl_adc_regmap.v
View File

@ -100,11 +100,11 @@ module ad_ip_jesd204_tpl_adc_regmap #(
wire adc_rst; wire adc_rst;
wire up_wreq_s; wire up_wreq_s;
wire [13:0] up_waddr_s; wire [9:0] up_waddr_s;
wire [31:0] up_wdata_s; wire [31:0] up_wdata_s;
wire [NUM_CHANNELS+1:0] up_wack_s; wire [NUM_CHANNELS+1:0] up_wack_s;
wire up_rreq_s; wire up_rreq_s;
wire [13:0] up_raddr_s; wire [9:0] up_raddr_s;
wire [31:0] up_rdata_s[0:NUM_CHANNELS+1]; wire [31:0] up_rdata_s[0:NUM_CHANNELS+1];
wire [NUM_CHANNELS+1:0] up_rack_s; wire [NUM_CHANNELS+1:0] up_rack_s;
@ -129,13 +129,14 @@ module ad_ip_jesd204_tpl_adc_regmap #(
// up bus interface // up bus interface
up_axi #( up_axi #(
.AXI_ADDRESS_WIDTH (16) .AXI_ADDRESS_WIDTH (12),
.ADDRESS_WIDTH (10)
) i_up_axi ( ) i_up_axi (
.up_clk (up_clk), .up_clk (up_clk),
.up_rstn (up_rstn), .up_rstn (up_rstn),
.up_axi_awvalid (s_axi_awvalid), .up_axi_awvalid (s_axi_awvalid),
.up_axi_awaddr ({4'b0,s_axi_awaddr}), .up_axi_awaddr (s_axi_awaddr),
.up_axi_awready (s_axi_awready), .up_axi_awready (s_axi_awready),
.up_axi_wvalid (s_axi_wvalid), .up_axi_wvalid (s_axi_wvalid),
.up_axi_wdata (s_axi_wdata), .up_axi_wdata (s_axi_wdata),
@ -145,7 +146,7 @@ module ad_ip_jesd204_tpl_adc_regmap #(
.up_axi_bresp (s_axi_bresp), .up_axi_bresp (s_axi_bresp),
.up_axi_bready (s_axi_bready), .up_axi_bready (s_axi_bready),
.up_axi_arvalid (s_axi_arvalid), .up_axi_arvalid (s_axi_arvalid),
.up_axi_araddr ({4'b0,s_axi_araddr}), .up_axi_araddr (s_axi_araddr),
.up_axi_arready (s_axi_arready), .up_axi_arready (s_axi_arready),
.up_axi_rvalid (s_axi_rvalid), .up_axi_rvalid (s_axi_rvalid),
.up_axi_rresp (s_axi_rresp), .up_axi_rresp (s_axi_rresp),
@ -191,6 +192,7 @@ module ad_ip_jesd204_tpl_adc_regmap #(
// common processor control // common processor control
up_adc_common #( up_adc_common #(
.COMMON_ID (6'h0),
.ID (ID), .ID (ID),
.DRP_DISABLE (1), .DRP_DISABLE (1),
.USERPORTS_DISABLE (1), .USERPORTS_DISABLE (1),
@ -233,11 +235,11 @@ module ad_ip_jesd204_tpl_adc_regmap #(
.up_clk (up_clk), .up_clk (up_clk),
.up_rstn (up_rstn), .up_rstn (up_rstn),
.up_wreq (up_wreq_s), .up_wreq (up_wreq_s),
.up_waddr (up_waddr_s), .up_waddr ({4'b0,up_waddr_s}),
.up_wdata (up_wdata_s), .up_wdata (up_wdata_s),
.up_wack (up_wack_s[0]), .up_wack (up_wack_s[0]),
.up_rreq (up_rreq_s), .up_rreq (up_rreq_s),
.up_raddr (up_raddr_s), .up_raddr ({4'b0,up_raddr_s}),
.up_rdata (up_rdata_s[0]), .up_rdata (up_rdata_s[0]),
.up_rack (up_rack_s[0]) .up_rack (up_rack_s[0])
); );
@ -246,6 +248,7 @@ module ad_ip_jesd204_tpl_adc_regmap #(
genvar i; genvar i;
for (i = 0; i < NUM_CHANNELS; i = i + 1) begin: g_channel for (i = 0; i < NUM_CHANNELS; i = i + 1) begin: g_channel
up_adc_channel #( up_adc_channel #(
.COMMON_ID (6'h1),
.CHANNEL_ID (i), .CHANNEL_ID (i),
.USERPORTS_DISABLE (1), .USERPORTS_DISABLE (1),
.DCFILTER_DISABLE (1), .DCFILTER_DISABLE (1),
@ -290,11 +293,11 @@ module ad_ip_jesd204_tpl_adc_regmap #(
.up_clk (up_clk), .up_clk (up_clk),
.up_rstn (up_rstn), .up_rstn (up_rstn),
.up_wreq (up_wreq_s), .up_wreq (up_wreq_s),
.up_waddr (up_waddr_s), .up_waddr ({4'b0,up_waddr_s}),
.up_wdata (up_wdata_s), .up_wdata (up_wdata_s),
.up_wack (up_wack_s[i+1]), .up_wack (up_wack_s[i+1]),
.up_rreq (up_rreq_s), .up_rreq (up_rreq_s),
.up_raddr (up_raddr_s), .up_raddr ({4'b0,up_raddr_s}),
.up_rdata (up_rdata_s[i+1]), .up_rdata (up_rdata_s[i+1]),
.up_rack (up_rack_s[i+1]) .up_rack (up_rack_s[i+1])
); );
@ -302,7 +305,7 @@ module ad_ip_jesd204_tpl_adc_regmap #(
endgenerate endgenerate
up_tpl_common #( up_tpl_common #(
.COMMON_ID(4'h3), // Offset of regmap .COMMON_ID(2'h3), // Offset of regmap
.NUM_PROFILES(NUM_PROFILES) // Number of JESD profiles .NUM_PROFILES(NUM_PROFILES) // Number of JESD profiles
) i_up_tpl_adc ( ) i_up_tpl_adc (
@ -328,4 +331,5 @@ module ad_ip_jesd204_tpl_adc_regmap #(
.up_rdata (up_rdata_s[NUM_CHANNELS+1]), .up_rdata (up_rdata_s[NUM_CHANNELS+1]),
.up_rack (up_rack_s[NUM_CHANNELS+1]) .up_rack (up_rack_s[NUM_CHANNELS+1])
); );
endmodule endmodule

10
library/jesd204/ad_ip_jesd204_tpl_common/up_tpl_common.v
View File

@ -38,7 +38,7 @@
module up_tpl_common #( module up_tpl_common #(
// parameters // parameters
parameter COMMON_ID = 4'hF, // Offset of regmap parameter COMMON_ID = 2'h3, // Offset of regmap
parameter NUM_PROFILES = 1 // Number of JESD profiles parameter NUM_PROFILES = 1 // Number of JESD profiles
)( )(
@ -56,11 +56,11 @@ module up_tpl_common #(
input up_rstn, input up_rstn,
input up_clk, input up_clk,
input up_wreq, input up_wreq,
input [13:0] up_waddr, input [9:0] up_waddr,
input [31:0] up_wdata, input [31:0] up_wdata,
output up_wack, output up_wack,
input up_rreq, input up_rreq,
input [13:0] up_raddr, input [9:0] up_raddr,
output [31:0] up_rdata, output [31:0] up_rdata,
output up_rack output up_rack
); );
@ -77,8 +77,8 @@ module up_tpl_common #(
// decode block select // decode block select
assign up_wreq_s = (up_waddr[13:8] == COMMON_ID) ? up_wreq : 1'b0; assign up_wreq_s = (up_waddr[9:8] == COMMON_ID) ? up_wreq : 1'b0;
assign up_rreq_s = (up_raddr[13:8] == COMMON_ID) ? up_rreq : 1'b0; assign up_rreq_s = (up_raddr[9:8] == COMMON_ID) ? up_rreq : 1'b0;
// processor write interface // processor write interface

17
library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac_regmap.v
View File

@ -94,11 +94,11 @@ module ad_ip_jesd204_tpl_dac_regmap #(
wire up_wreq_s; wire up_wreq_s;
wire [13:0] up_waddr_s; wire [9:0] up_waddr_s;
wire [31:0] up_wdata_s; wire [31:0] up_wdata_s;
wire [NUM_CHANNELS+1:0] up_wack_s; wire [NUM_CHANNELS+1:0] up_wack_s;
wire up_rreq_s; wire up_rreq_s;
wire [13:0] up_raddr_s; wire [9:0] up_raddr_s;
wire [31:0] up_rdata_s[0:NUM_CHANNELS+1]; wire [31:0] up_rdata_s[0:NUM_CHANNELS+1];
wire [NUM_CHANNELS+1:0] up_rack_s; wire [NUM_CHANNELS+1:0] up_rack_s;
@ -116,7 +116,8 @@ module ad_ip_jesd204_tpl_dac_regmap #(
// up bus interface // up bus interface
up_axi #( up_axi #(
.AXI_ADDRESS_WIDTH (16) .AXI_ADDRESS_WIDTH (12),
.ADDRESS_WIDTH (10)
) i_up_axi ( ) i_up_axi (
.up_clk (up_clk), .up_clk (up_clk),
.up_rstn (up_rstn), .up_rstn (up_rstn),
@ -213,11 +214,11 @@ module ad_ip_jesd204_tpl_dac_regmap #(
.up_rstn (up_rstn), .up_rstn (up_rstn),
.up_wreq (up_wreq_s), .up_wreq (up_wreq_s),
.up_waddr (up_waddr_s), .up_waddr ({4'b0,up_waddr_s}),
.up_wdata (up_wdata_s), .up_wdata (up_wdata_s),
.up_wack (up_wack_s[0]), .up_wack (up_wack_s[0]),
.up_rreq (up_rreq_s), .up_rreq (up_rreq_s),
.up_raddr (up_raddr_s), .up_raddr ({4'b0,up_raddr_s}),
.up_rdata (up_rdata_s[0]), .up_rdata (up_rdata_s[0]),
.up_rack (up_rack_s[0]) .up_rack (up_rack_s[0])
); );
@ -264,11 +265,11 @@ module ad_ip_jesd204_tpl_dac_regmap #(
.up_clk (up_clk), .up_clk (up_clk),
.up_rstn (up_rstn), .up_rstn (up_rstn),
.up_wreq (up_wreq_s), .up_wreq (up_wreq_s),
.up_waddr (up_waddr_s), .up_waddr ({4'b0,up_waddr_s}),
.up_wdata (up_wdata_s), .up_wdata (up_wdata_s),
.up_wack (up_wack_s[i+1]), .up_wack (up_wack_s[i+1]),
.up_rreq (up_rreq_s), .up_rreq (up_rreq_s),
.up_raddr (up_raddr_s), .up_raddr ({4'b0,up_raddr_s}),
.up_rdata (up_rdata_s[i+1]), .up_rdata (up_rdata_s[i+1]),
.up_rack (up_rack_s[i+1]) .up_rack (up_rack_s[i+1])
); );
@ -276,7 +277,7 @@ module ad_ip_jesd204_tpl_dac_regmap #(
endgenerate endgenerate
up_tpl_common #( up_tpl_common #(
.COMMON_ID(4'h3), // Offset of regmap .COMMON_ID(2'h3), // Offset of regmap
.NUM_PROFILES(NUM_PROFILES) // Number of JESD profiles .NUM_PROFILES(NUM_PROFILES) // Number of JESD profiles
) i_up_tpl_dac ( ) i_up_tpl_dac (