[HW]: Clean Chimera Top Interface

pulp-platform · Oct 11, 2024 · edfb991 · edfb991
1 parent 04bf168
commit edfb991
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 49 deletions.
diff --git a/hw/chimera_top_wrapper.sv b/hw/chimera_top_wrapper.sv
@@ -60,14 +60,10 @@ module chimera_top_wrapper
   output apb_req_t                           apb_req_o,
   // PMU  Clusters control signals
   input  logic      [       ExtClusters-1:0] pmu_rst_clusters_ni,
-  input  logic      [       ExtClusters-1:0] pmu_clkgate_en_clusters_i,   // TODO: lleone
   input  logic      [       ExtClusters-1:0] pmu_iso_en_clusters_i,
   output logic      [       ExtClusters-1:0] pmu_iso_ack_clusters_o,
   // PMU  Memory Island control signals
-  input  logic      [MemIslNumWideBanks-1:0] pmu_rst_memisland_ni,
-  input  logic      [MemIslNumWideBanks-1:0] pmu_clkgate_en_memisland_i,  // TODO: lleone
-  input  logic      [MemIslNumWideBanks-1:0] pmu_iso_en_memisland_i,
-  output logic      [MemIslNumWideBanks-1:0] pmu_iso_ack_memisland_o
+  input  logic      [MemIslNumWideBanks-1:0] pmu_rst_memisland_ni
 
 
 );

diff --git a/target/sim/src/fixture_chimera_soc.sv b/target/sim/src/fixture_chimera_soc.sv
@@ -63,50 +63,46 @@ module fixture_chimera_soc #(
   chimera_top_wrapper #(
     .SelectedCfg(SelectedCfg)
   ) dut (
-    .soc_clk_i                 (soc_clk),
-    .clu_clk_i                 (clu_clk),
-    .rst_ni                    (rst_n),
-    .test_mode_i               (test_mode),
-    .boot_mode_i               (boot_mode),
-    .rtc_i                     (rtc),
-    .jtag_tck_i                (jtag_tck),
-    .jtag_trst_ni              (jtag_trst_n),
-    .jtag_tms_i                (jtag_tms),
-    .jtag_tdi_i                (jtag_tdi),
-    .jtag_tdo_o                (jtag_tdo),
-    .jtag_tdo_oe_o             (),
-    .uart_tx_o                 (uart_tx),
-    .uart_rx_i                 (uart_rx),
-    .uart_rts_no               (),
-    .uart_dtr_no               (),
-    .uart_cts_ni               (1'b0),
-    .uart_dsr_ni               (1'b0),
-    .uart_dcd_ni               (1'b0),
-    .uart_rin_ni               (1'b0),
-    .i2c_sda_o                 (i2c_sda_o),
-    .i2c_sda_i                 (i2c_sda_i),
-    .i2c_sda_en_o              (i2c_sda_en),
-    .i2c_scl_o                 (i2c_scl_o),
-    .i2c_scl_i                 (i2c_scl_i),
-    .i2c_scl_en_o              (i2c_scl_en),
-    .spih_sck_o                (spih_sck_o),
-    .spih_sck_en_o             (spih_sck_en),
-    .spih_csb_o                (spih_csb_o),
-    .spih_csb_en_o             (spih_csb_en),
-    .spih_sd_o                 (spih_sd_o),
-    .spih_sd_en_o              (spih_sd_en),
-    .spih_sd_i                 (spih_sd_i),
-    .gpio_i                    ('0),
-    .gpio_o                    (),
-    .gpio_en_o                 (),
-    .pmu_rst_clusters_ni       ({ExtClusters{rst_n}}),
-    .pmu_clkgate_en_clusters_i (),
-    .pmu_iso_en_clusters_i     ('0),                                  // Never Isolate
-    .pmu_iso_ack_clusters_o    (),
-    .pmu_rst_memisland_ni      ({DutCfg.MemIslNumWideBanks{rst_n}}),
-    .pmu_clkgate_en_memisland_i(),
-    .pmu_iso_en_memisland_i    ('0),                                  // Never Isolate,
-    .pmu_iso_ack_memisland_o   ()
+    .soc_clk_i             (soc_clk),
+    .clu_clk_i             (clu_clk),
+    .rst_ni                (rst_n),
+    .test_mode_i           (test_mode),
+    .boot_mode_i           (boot_mode),
+    .rtc_i                 (rtc),
+    .jtag_tck_i            (jtag_tck),
+    .jtag_trst_ni          (jtag_trst_n),
+    .jtag_tms_i            (jtag_tms),
+    .jtag_tdi_i            (jtag_tdi),
+    .jtag_tdo_o            (jtag_tdo),
+    .jtag_tdo_oe_o         (),
+    .uart_tx_o             (uart_tx),
+    .uart_rx_i             (uart_rx),
+    .uart_rts_no           (),
+    .uart_dtr_no           (),
+    .uart_cts_ni           (1'b0),
+    .uart_dsr_ni           (1'b0),
+    .uart_dcd_ni           (1'b0),
+    .uart_rin_ni           (1'b0),
+    .i2c_sda_o             (i2c_sda_o),
+    .i2c_sda_i             (i2c_sda_i),
+    .i2c_sda_en_o          (i2c_sda_en),
+    .i2c_scl_o             (i2c_scl_o),
+    .i2c_scl_i             (i2c_scl_i),
+    .i2c_scl_en_o          (i2c_scl_en),
+    .spih_sck_o            (spih_sck_o),
+    .spih_sck_en_o         (spih_sck_en),
+    .spih_csb_o            (spih_csb_o),
+    .spih_csb_en_o         (spih_csb_en),
+    .spih_sd_o             (spih_sd_o),
+    .spih_sd_en_o          (spih_sd_en),
+    .spih_sd_i             (spih_sd_i),
+    .gpio_i                ('0),
+    .gpio_o                (),
+    .gpio_en_o             (),
+    .pmu_rst_clusters_ni   ({ExtClusters{rst_n}}),
+    .pmu_iso_en_clusters_i ('0),                                 // Never Isolate
+    .pmu_iso_ack_clusters_o(),
+    .pmu_rst_memisland_ni  ({DutCfg.MemIslNumWideBanks{rst_n}})
 
   );