From: William D. Jones <thor0505@comcast.net>
Date: Fri, 29 Jan 2021 23:14:13 +0000 (-0500)
Subject: machxo2: Fix naming of TRELLIS_IO ports to match PIO pins in routing graph.
X-Git-Tag: working-ls180~52
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8348c45e4f679b44b238c0f205e2e3815c909c38;p=yosys.git

machxo2: Fix naming of TRELLIS_IO ports to match PIO pins in routing graph.
---

diff --git a/techlibs/machxo2/cells_map.v b/techlibs/machxo2/cells_map.v
index a02630703..15428d4dc 100644
--- a/techlibs/machxo2/cells_map.v
+++ b/techlibs/machxo2/cells_map.v
@@ -28,7 +28,7 @@ endmodule
 module  \$_DFF_P_ (input D, C, output Q); FACADE_FF #(.CEMUX("1"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET")) _TECHMAP_REPLACE_ (.CLK(C), .LSR(1'b0), .DI(D), .Q(Q)); endmodule
 
 // IO- "$__" cells for the iopadmap pass.
-module  \$__FACADE_OUTPAD (input I, output O); FACADE_IO #(.DIR("OUTPUT")) _TECHMAP_REPLACE_ (.PAD(O), .I(I), .EN(1'b1)); endmodule
+module  \$__FACADE_OUTPAD (input I, output O); FACADE_IO #(.DIR("OUTPUT")) _TECHMAP_REPLACE_ (.PAD(O), .I(I), .T(1'b1)); endmodule
 module  \$__FACADE_INPAD (input I, output O); FACADE_IO #(.DIR("INPUT")) _TECHMAP_REPLACE_ (.PAD(I), .O(O)); endmodule
-module  \$__FACADE_TOUTPAD (input I, OE, output O); FACADE_IO #(.DIR("OUTPUT")) _TECHMAP_REPLACE_ (.PAD(O), .I(I), .EN(OE)); endmodule
-module  \$__FACADE_TINOUTPAD (input I, OE, output O, inout B); FACADE_IO #(.DIR("BIDIR")) _TECHMAP_REPLACE_ (.PAD(B), .I(I), .O(O), .EN(OE)); endmodule
+module  \$__FACADE_TOUTPAD (input I, OE, output O); FACADE_IO #(.DIR("OUTPUT")) _TECHMAP_REPLACE_ (.PAD(O), .I(I), .T(OE)); endmodule
+module  \$__FACADE_TINOUTPAD (input I, OE, output O, inout B); FACADE_IO #(.DIR("BIDIR")) _TECHMAP_REPLACE_ (.PAD(B), .I(I), .O(O), .T(OE)); endmodule
diff --git a/techlibs/machxo2/cells_sim.v b/techlibs/machxo2/cells_sim.v
index 3dd41334e..4e2a1bb6c 100644
--- a/techlibs/machxo2/cells_sim.v
+++ b/techlibs/machxo2/cells_sim.v
@@ -162,16 +162,16 @@ module FACADE_IO #(
 	parameter DIR = "INPUT"
 ) (
 	inout PAD,
-	input I, EN,
+	input I, T,
 	output O
 );
 	generate
 		if (DIR == "INPUT") begin
 			assign O = PAD;
 		end else if (DIR == "OUTPUT") begin
-			assign PAD = EN ? I : 1'bz;
+			assign PAD = T ? I : 1'bz;
 		end else if (DIR == "BIDIR") begin
-			assign PAD = EN ? I : 1'bz;
+			assign PAD = T ? I : 1'bz;
 			assign O = PAD;
 		end else begin
 			ERROR_UNKNOWN_IO_MODE error();