Просмотр исходного кода

cores/qspi_master: IOBs instances cleanup in PHYs

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Sylvain Munaut 4 лет назад
Родитель
Сommit
71cf37bb2f

+ 2 - 5
cores/qspi_master/rtl/qspi_phy_ice40_1x.v

@@ -68,7 +68,6 @@ module qspi_phy_ice40_1x #(
 		.IO_STANDARD("SB_LVCMOS")
 	) iob_io_I[3:0] (
 		.PACKAGE_PIN(pad_io),
-		.CLOCK_ENABLE(1'b1),
 		.INPUT_CLK(clk),
 		.OUTPUT_CLK(clk),
 		.OUTPUT_ENABLE(phy_io_oe),
@@ -88,15 +87,13 @@ module qspi_phy_ice40_1x #(
 				clk_active <= phy_clk_o;
 
 			SB_IO #(
-				.PIN_TYPE(6'b110011),
-				.PULLUP(1'b1),
+				.PIN_TYPE(6'b0100_11),
+				.PULLUP(1'b0),
 				.NEG_TRIGGER(1'b0),
 				.IO_STANDARD("SB_LVCMOS")
 			) iob_clk_I (
 				.PACKAGE_PIN(pad_clk),
-				.CLOCK_ENABLE(1'b1),
 				.OUTPUT_CLK(clk),
-				.OUTPUT_ENABLE(1'b1),
 				.D_OUT_0(1'b0),
 				.D_OUT_1(clk_active)
 			);

+ 1 - 4
cores/qspi_master/rtl/qspi_phy_ice40_2x.v

@@ -79,7 +79,6 @@ module qspi_phy_ice40_2x #(
 		.IO_STANDARD("SB_LVCMOS")
 	) iob_io_I[3:0] (
 		.PACKAGE_PIN(pad_io),
-		.CLOCK_ENABLE(1'b1),
 		.INPUT_CLK(clk_1x),
 		.OUTPUT_CLK(clk_1x),
 		.OUTPUT_ENABLE(phy_io_oe),
@@ -123,15 +122,13 @@ module qspi_phy_ice40_2x #(
 			assign clk_out = (clk_toggle == clk_toggle_r) ? clk_active[0] : clk_active[1];
 
 			SB_IO #(
-				.PIN_TYPE(6'b110011),
+				.PIN_TYPE(6'b0100_11),
 				.PULLUP(1'b1),
 				.NEG_TRIGGER(1'b0),
 				.IO_STANDARD("SB_LVCMOS")
 			) iob_clk_I (
 				.PACKAGE_PIN(pad_clk),
-				.CLOCK_ENABLE(1'b1),
 				.OUTPUT_CLK(clk_2x),
-				.OUTPUT_ENABLE(1'b1),
 				.D_OUT_0(clk_out),
 				.D_OUT_1(1'b0)
 			);

+ 2 - 2
cores/qspi_master/rtl/qspi_phy_ice40_4x.v

@@ -124,7 +124,7 @@ module qspi_phy_ice40_4x #(
 
 	// IOB
 	SB_IO #(
-		.PIN_TYPE(6'b 1101_00),	// Out:SDRwOE, In:DDR
+		.PIN_TYPE(6'b1101_00),	// Out:SDRwOE, In:DDR
 		.PULLUP(1'b0),
 		.NEG_TRIGGER(1'b0),
 		.IO_STANDARD("SB_LVCMOS")
@@ -158,7 +158,7 @@ module qspi_phy_ice40_4x #(
 
 			// IOB
 			SB_IO #(
-				.PIN_TYPE(6'b 0100_01),	// Out:DDR, In:n/a
+				.PIN_TYPE(6'b0100_11),	// Out:DDR, In:n/a
 				.PULLUP(1'b0),
 				.NEG_TRIGGER(1'b0),
 				.IO_STANDARD("SB_LVCMOS")