[pinmux] Remove tie-off values TODO

This does not seem to be necessary anymore. Signed-off-by: Michael Schaffner <[email protected]>
lowRISC · Apr 13, 2021 · d61e2e6 · d61e2e6
1 parent aa96b51
commit d61e2e6
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 26 deletions.
diff --git a/hw/ip/pinmux/rtl/pinmux_pkg.sv b/hw/ip/pinmux/rtl/pinmux_pkg.sv
@@ -17,7 +17,6 @@ package pinmux_pkg;
   // the concatenated {DIO, MIO} packed array.
   typedef struct packed {
     logic                     const_sampling; // TODO: check whether this can be eliminated.
-    logic        [NumIOs-1:0] tie_offs;       // TODO: check whether this can be eliminated.
     integer                   tck_idx;
     integer                   tms_idx;
     integer                   trst_idx;
@@ -37,7 +36,6 @@ package pinmux_pkg;
 
   parameter target_cfg_t DefaultTargetCfg = '{
     const_sampling:    1'b0,
-    tie_offs:          '0,
     tck_idx:           0,
     tms_idx:           0,
     trst_idx:          0,

diff --git a/hw/ip/pinmux/rtl/pinmux_strap_sampling.sv b/hw/ip/pinmux/rtl/pinmux_strap_sampling.sv
@@ -250,7 +250,7 @@ module pinmux_strap_sampling
         k == TargetCfg.trst_idx ||
         k == TargetCfg.tdi_idx  ||
         k == TargetCfg.tdo_idx) begin : gen_jtag_signal
-      assign in_core_o[k] = (jtag_en) ? TargetCfg.tie_offs[k] : in_padring_i[k];
+      assign in_core_o[k] = (jtag_en) ? 1'b0 : in_padring_i[k];
     end else begin : gen_other_inputs
       assign in_core_o[k] = in_padring_i[k];
     end

diff --git a/hw/top_earlgrey/rtl/autogen/chip_earlgrey_asic.sv b/hw/top_earlgrey/rtl/autogen/chip_earlgrey_asic.sv
@@ -101,16 +101,9 @@ module chip_earlgrey_asic (
   parameter int TdiPadIdx = 37;
   parameter int TdoPadIdx = 36;
 
-  // TODO: this is temporary and will be removed in the future.
-  // This specifies the tie-off values of the muxed MIO/DIOs
-  // when the JTAG is active. SPI CSB is active low.
-  localparam logic [pinmux_pkg::NumIOs-1:0] TieOffValues = pinmux_pkg::NumIOs'(1'b1 << (
-      pinmux_reg_pkg::NMioPads + DioSpiDeviceCsb));
-
   // DFT and Debug signal positions in the pinout.
   localparam pinmux_pkg::target_cfg_t PinmuxTargetCfg = '{
     const_sampling:    1'b1,
-    tie_offs:          TieOffValues, // TODO: can we remove this and just set it to zero?
     tck_idx:           TckPadIdx,
     tms_idx:           TmsPadIdx,
     trst_idx:          TrstNPadIdx,

diff --git a/hw/top_earlgrey/rtl/autogen/chip_earlgrey_nexysvideo.sv b/hw/top_earlgrey/rtl/autogen/chip_earlgrey_nexysvideo.sv
@@ -88,16 +88,9 @@ module chip_earlgrey_nexysvideo #(
   parameter int TdiPadIdx = 51;
   parameter int TdoPadIdx = 52;
 
-  // TODO: this is temporary and will be removed in the future.
-  // This specifies the tie-off values of the muxed MIO/DIOs
-  // when the JTAG is active. SPI CSB is active low.
-  localparam logic [pinmux_pkg::NumIOs-1:0] TieOffValues = pinmux_pkg::NumIOs'(1'b1 << (
-      pinmux_reg_pkg::NMioPads + DioSpiDeviceCsb));
-
   // DFT and Debug signal positions in the pinout.
   localparam pinmux_pkg::target_cfg_t PinmuxTargetCfg = '{
     const_sampling:    1'b1,
-    tie_offs:          TieOffValues, // TODO: can we remove this and just set it to zero?
     tck_idx:           TckPadIdx,
     tms_idx:           TmsPadIdx,
     trst_idx:          TrstNPadIdx,

diff --git a/hw/top_earlgrey/rtl/chip_earlgrey_verilator.sv b/hw/top_earlgrey/rtl/chip_earlgrey_verilator.sv
@@ -126,7 +126,6 @@ module chip_earlgrey_verilator (
   // DFT and Debug signal positions in the pinout.
   localparam pinmux_pkg::target_cfg_t PinmuxTargetCfg = '{
     const_sampling: 1'b1,
-    tie_offs:       '0,
     tck_idx:        pinmux_reg_pkg::NMioPads +
                     top_earlgrey_pkg::DioSpiDeviceSck,
     tms_idx:        pinmux_reg_pkg::NMioPads +

diff --git a/hw/top_englishbreakfast/rtl/chip_englishbreakfast_verilator.sv b/hw/top_englishbreakfast/rtl/chip_englishbreakfast_verilator.sv
@@ -126,7 +126,6 @@ module chip_englishbreakfast_verilator (
   // DFT and Debug signal positions in the pinout.
   localparam pinmux_pkg::target_cfg_t PinmuxTargetCfg = '{
     const_sampling: 1'b1,
-    tie_offs:       '0,
     tck_idx:        pinmux_reg_pkg::NMioPads +
                     top_englishbreakfast_pkg::DioSpiDeviceSck,
     tms_idx:        pinmux_reg_pkg::NMioPads +

diff --git a/util/topgen/templates/chiplevel.sv.tpl b/util/topgen/templates/chiplevel.sv.tpl
@@ -122,16 +122,9 @@ module chip_${top["name"]}_${target["name"]} (
   % endfor
 % endif
 
-  // TODO: this is temporary and will be removed in the future.
-  // This specifies the tie-off values of the muxed MIO/DIOs
-  // when the JTAG is active. SPI CSB is active low.
-  localparam logic [pinmux_pkg::NumIOs-1:0] TieOffValues = pinmux_pkg::NumIOs'(1'b1 << (
-      pinmux_reg_pkg::NMioPads + DioSpiDeviceCsb));
-
   // DFT and Debug signal positions in the pinout.
   localparam pinmux_pkg::target_cfg_t PinmuxTargetCfg = '{
     const_sampling:    1'b1,
-    tie_offs:          TieOffValues, // TODO: can we remove this and just set it to zero?
     tck_idx:           TckPadIdx,
     tms_idx:           TmsPadIdx,
     trst_idx:          TrstNPadIdx,