Skip to content

Commit 2a42ee8

Browse files
committed
[top_earlgrey/rtl] Connect IOB mux from AST to padring
Together with the previous commit, this resolves #23280. Signed-off-by: Andreas Kurth <adk@lowrisc.org>
1 parent 9f3181c commit 2a42ee8

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

hw/top_earlgrey/rtl/autogen/chip_earlgrey_asic.sv

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ module chip_earlgrey_asic #(
196196
////////////////////////
197197

198198

199+
logic [3:0] mux_iob_sel;
200+
199201
pad_attr_t [pinmux_reg_pkg::NMioPads-1:0] mio_attr;
200202
pad_attr_t [pinmux_reg_pkg::NDioPads-1:0] dio_attr;
201203
logic [pinmux_reg_pkg::NMioPads-1:0] mio_out;
@@ -477,7 +479,7 @@ module chip_earlgrey_asic #(
477479
// This is only used for scan and DFT purposes
478480
.clk_scan_i ( ast_base_clks.clk_sys ),
479481
.scanmode_i ( scanmode ),
480-
.mux_iob_sel_i ('0), // TODO(#23280)
482+
.mux_iob_sel_i ( mux_iob_sel ),
481483
.dio_in_raw_o ( dio_in_raw ),
482484
// Chip IOs
483485
.dio_pad_io ({
@@ -968,6 +970,7 @@ module chip_earlgrey_asic #(
968970
// pinmux related
969971
.padmux2ast_i ( pad2ast ),
970972
.ast2padmux_o ( ast2pinmux ),
973+
.mux_iob_sel_o ( mux_iob_sel ),
971974
.ext_freq_is_96m_i ( hi_speed_sel ),
972975
.all_clk_byp_req_i ( all_clk_byp_req ),
973976
.all_clk_byp_ack_o ( all_clk_byp_ack ),

hw/top_earlgrey/rtl/autogen/chip_earlgrey_cw310.sv

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ module chip_earlgrey_cw310 #(
206206
////////////////////////
207207

208208

209+
logic [3:0] mux_iob_sel;
210+
209211
pad_attr_t [pinmux_reg_pkg::NMioPads-1:0] mio_attr;
210212
pad_attr_t [pinmux_reg_pkg::NDioPads-1:0] dio_attr;
211213
logic [pinmux_reg_pkg::NMioPads-1:0] mio_out;
@@ -355,7 +357,7 @@ module chip_earlgrey_cw310 #(
355357
// This is only used for scan and DFT purposes
356358
.clk_scan_i ( 1'b0 ),
357359
.scanmode_i ( prim_mubi_pkg::MuBi4False ),
358-
.mux_iob_sel_i ('0), // TODO(#23280)
360+
.mux_iob_sel_i ( mux_iob_sel ),
359361
.dio_in_raw_o ( dio_in_raw ),
360362
// Chip IOs
361363
.dio_pad_io ({
@@ -940,6 +942,7 @@ module chip_earlgrey_cw310 #(
940942
// pinmux related
941943
.padmux2ast_i ( pad2ast ),
942944
.ast2padmux_o ( ast2pinmux ),
945+
.mux_iob_sel_o ( mux_iob_sel ),
943946
.ext_freq_is_96m_i ( hi_speed_sel ),
944947
.all_clk_byp_req_i ( all_clk_byp_req ),
945948
.all_clk_byp_ack_o ( all_clk_byp_ack ),

hw/top_earlgrey/rtl/autogen/chip_earlgrey_cw340.sv

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ module chip_earlgrey_cw340 #(
205205
////////////////////////
206206

207207

208+
logic [3:0] mux_iob_sel;
209+
208210
pad_attr_t [pinmux_reg_pkg::NMioPads-1:0] mio_attr;
209211
pad_attr_t [pinmux_reg_pkg::NDioPads-1:0] dio_attr;
210212
logic [pinmux_reg_pkg::NMioPads-1:0] mio_out;
@@ -351,7 +353,7 @@ module chip_earlgrey_cw340 #(
351353
// This is only used for scan and DFT purposes
352354
.clk_scan_i ( 1'b0 ),
353355
.scanmode_i ( prim_mubi_pkg::MuBi4False ),
354-
.mux_iob_sel_i ('0), // TODO(#23280)
356+
.mux_iob_sel_i ( mux_iob_sel ),
355357
.dio_in_raw_o ( dio_in_raw ),
356358
// Chip IOs
357359
.dio_pad_io ({
@@ -931,6 +933,7 @@ module chip_earlgrey_cw340 #(
931933
// pinmux related
932934
.padmux2ast_i ( pad2ast ),
933935
.ast2padmux_o ( ast2pinmux ),
936+
.mux_iob_sel_o ( mux_iob_sel ),
934937
.ext_freq_is_96m_i ( hi_speed_sel ),
935938
.all_clk_byp_req_i ( all_clk_byp_req ),
936939
.all_clk_byp_ack_o ( all_clk_byp_ack ),

util/topgen/templates/chiplevel.sv.tpl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ module chip_${top["name"]}_${target["name"]} #(
182182
wire ${port};
183183
% endfor
184184

185+
logic [3:0] mux_iob_sel;
186+
185187
pad_attr_t [pinmux_reg_pkg::NMioPads-1:0] mio_attr;
186188
pad_attr_t [pinmux_reg_pkg::NDioPads-1:0] dio_attr;
187189
logic [pinmux_reg_pkg::NMioPads-1:0] mio_out;
@@ -310,7 +312,7 @@ module chip_${top["name"]}_${target["name"]} #(
310312
.clk_scan_i ( 1'b0 ),
311313
.scanmode_i ( prim_mubi_pkg::MuBi4False ),
312314
% endif
313-
.mux_iob_sel_i ('0), // TODO(#23280)
315+
.mux_iob_sel_i ( mux_iob_sel ),
314316
.dio_in_raw_o ( dio_in_raw ),
315317
// Chip IOs
316318
.dio_pad_io ({
@@ -842,6 +844,7 @@ module chip_${top["name"]}_${target["name"]} #(
842844
// pinmux related
843845
.padmux2ast_i ( pad2ast ),
844846
.ast2padmux_o ( ast2pinmux ),
847+
.mux_iob_sel_o ( mux_iob_sel ),
845848
.ext_freq_is_96m_i ( hi_speed_sel ),
846849
.all_clk_byp_req_i ( all_clk_byp_req ),
847850
.all_clk_byp_ack_o ( all_clk_byp_ack ),

0 commit comments

Comments
 (0)