revert: #33 and #36 seem to PnR dependent on icebreaker, revert until…

… root cause found (#40)

* Revert "cores/vco: fix and modularize vco example (#36)"

This reverts commit b033f23.

* Revert "gateware: rewrite clocking architecture, improve ak4619 driver (#33)"

This reverts commit 052d6b0.

.github/workflows/main.yml

@@ -1,6 +1,6 @@
 name: build & test
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   ubuntu-build-icebreaker:

gateware/boards/colorlight_i5/pinmap.lpf

@@ -1,5 +1,3 @@
-SYSCONFIG COMPRESS_CONFIG=ON;
-
 LOCATE      COMP "CLK" SITE "P3";
 IOBUF       PORT "CLK" IO_TYPE=LVCMOS33;
 FREQUENCY   PORT "CLK" 25 MHZ;

gateware/boards/colorlight_i5/sysmgr.v

@@ -4,23 +4,18 @@ module sysmgr (
     // Assumed 25Mhz for Colorlight i5.
 	input  wire clk_in,
 	input  wire rst_in,
-	output wire clk_256fs,
-	output wire clk_fs,
+	output wire clk_12m,
 	output wire rst_out
 );
 
+// Signals
 wire clk_fb;
+
 wire pll_lock;
 wire pll_reset;
-wire rst_i;
 
+wire rst_i;
 reg [7:0] rst_cnt;
-reg [7:0] clkdiv;
-
-assign pll_reset = rst_in;
-assign rst_i = ~rst_cnt[7];
-assign rst_out = rst_i;
-assign clk_fs = clkdiv[7];
 
 `ifndef VERILATOR_LINT_ONLY
 
@@ -54,7 +49,7 @@ EHXPLLL #(
         .RST(pll_reset),
         .STDBY(1'b0),
         .CLKI(clk_in),
-        .CLKOS(clk_256fs),
+        .CLKOS(clk_12m),
         .CLKFB(clk_fb),
         .CLKINTFB(clk_fb),
         .PHASESEL0(1'b0),
@@ -69,16 +64,17 @@ EHXPLLL #(
 
 `endif
 
+// PLL reset generation
+assign pll_reset = rst_in;
+// Logic reset generation
 always @(posedge clk_in)
     if (!pll_lock)
         rst_cnt <= 8'h0;
     else if (~rst_cnt[7])
         rst_cnt <= rst_cnt + 1;
 
-always @(posedge clk_256fs)
-    if (rst_i)
-        clkdiv <= 8'h00;
-    else
-        clkdiv <= clkdiv + 1;
+assign rst_i = ~rst_cnt[7];
+
+assign rst_out = rst_i;
 
 endmodule // sysmgr

gateware/boards/colorlight_i9/pinmap.lpf

@@ -1,5 +1,3 @@
-SYSCONFIG COMPRESS_CONFIG=ON;
-
 LOCATE      COMP "CLK" SITE "P3";
 IOBUF       PORT "CLK" IO_TYPE=LVCMOS33;
 FREQUENCY   PORT "CLK" 25 MHZ;

gateware/boards/ecpix5/pinmap.lpf

@@ -1,13 +1,11 @@
-SYSCONFIG COMPRESS_CONFIG=ON;
-
 LOCATE      COMP "CLK" SITE "K23";
 IOBUF       PORT "CLK" IO_TYPE=LVCMOS33;
 FREQUENCY   PORT "CLK" 100 MHZ;
 
 # This pinout assumes a ribbon cable IS used and the PMOD is
 # connected through an IDC ribbon to the dev board.
 
-# These pads are PMOD_P0
+# These pads are PMOD_P2A
 LOCATE COMP "PMOD_MCLK"    SITE "W26";
 LOCATE COMP "PMOD_PDN"     SITE "V26";
 LOCATE COMP "PMOD_I2C_SDA" SITE "U26";
@@ -26,7 +24,7 @@ IOBUF  PORT "PMOD_SDOUT1" PULLMODE=NONE IO_TYPE=LVCMOS33 DRIVE=4;
 IOBUF  PORT "PMOD_LRCK" PULLMODE=NONE IO_TYPE=LVCMOS33 DRIVE=4;
 IOBUF  PORT "PMOD_BICK" PULLMODE=NONE IO_TYPE=LVCMOS33 DRIVE=4;
 
-# This pad is the reset pin of the ECP5
+# This pad is the reset pin of the ECP5 (SW1_RESET)
 LOCATE COMP "RESET_BUTTON" SITE "N5";
 IOBUF  PORT "RESET_BUTTON" PULLMODE=NONE IO_TYPE=LVCMOS33 DRIVE=4;
 

gateware/boards/ecpix5/sysmgr.v

@@ -4,23 +4,18 @@ module sysmgr (
     // Assumed 100Mhz for ECPIX-5.
 	input  wire clk_in,
 	input  wire rst_in,
-	output wire clk_256fs,
-	output wire clk_fs,
+	output wire clk_12m,
 	output wire rst_out
 );
 
+// Signals
 wire clk_fb;
+
 wire pll_lock;
 wire pll_reset;
-wire rst_i;
 
+wire rst_i;
 reg [7:0] rst_cnt;
-reg [7:0] clkdiv;
-
-assign rst_i = ~rst_cnt[7];
-assign rst_out = rst_i;
-assign pll_reset = rst_in;
-assign clk_fs = clkdiv[7];
 
 `ifndef VERILATOR_LINT_ONLY
 
@@ -50,7 +45,7 @@ EHXPLLL #(
         .RST(pll_reset),
         .STDBY(1'b0),
         .CLKI(clk_in),
-        .CLKOP(clk_256fs),
+        .CLKOP(clk_12m),
         .CLKFB(clk_fb),
         .CLKINTFB(clk_fb),
         .PHASESEL0(1'b0),
@@ -65,16 +60,17 @@ EHXPLLL #(
 
 `endif
 
+// PLL reset generation
+assign pll_reset = rst_in;
+// Logic reset generation
 always @(posedge clk_in)
     if (!pll_lock)
         rst_cnt <= 8'h0;
     else if (~rst_cnt[7])
         rst_cnt <= rst_cnt + 1;
 
-always @(posedge clk_256fs)
-    if (rst_i)
-        clkdiv <= 8'h00;
-    else
-        clkdiv <= clkdiv + 1;
+assign rst_i = ~rst_cnt[7];
+
+assign rst_out = rst_i;
 
 endmodule // sysmgr

gateware/boards/icebreaker/sysmgr.v

@@ -7,8 +7,7 @@ module sysmgr (
     // Actually the output here is the same frequency as the input
     // but we leave all this PLL logic here as you might need to scale
     // the clock down to 12m on different boards.
-	output wire clk_256fs,
-	output wire clk_fs,
+	output wire clk_12m,
 	output wire rst_out
 );
 
@@ -20,14 +19,7 @@ module sysmgr (
 	wire clk_2x_i;
 	wire clk_1x_i;
 	wire rst_i;
-
 	reg [7:0] rst_cnt;
-	reg [7:0] clkdiv;
-
-	assign clk_256fs = clk_1x_i;
-	assign pll_reset_n = ~rst_in;
-	assign rst_i = rst_cnt[7];
-	assign clk_fs = clkdiv[7];
 
 	// PLL instance
 `ifndef VERILATOR_LINT_ONLY
@@ -58,19 +50,19 @@ module sysmgr (
 	);
 `endif
 
+	assign clk_12m = clk_1x_i;
+
+	// PLL reset generation
+	assign pll_reset_n = ~rst_in;
+
 	// Logic reset generation
 	always @(posedge clk_1x_i or negedge pll_lock)
 		if (!pll_lock)
 			rst_cnt <= 8'h80;
 		else if (rst_cnt[7])
 			rst_cnt <= rst_cnt + 1;
 
-    always @(posedge clk_256fs)
-        if (rst_i)
-            clkdiv <= 8'h00;
-        else
-            clkdiv <= clkdiv + 1;
-
+	assign rst_i = rst_cnt[7];
 
 `ifndef VERILATOR_LINT_ONLY
 	SB_GB rst_gbuf_I (

gateware/boards/pico_ice/sysmgr.v

@@ -2,20 +2,13 @@
 
 module sysmgr (
 	input  wire rst_in,
-	output wire clk_256fs,
-	output wire clk_fs,
+	output wire clk_12m,
 	output wire rst_out
 );
 
     wire clk_12m;
 	wire rst_i;
-
 	reg [7:0] rst_cnt = 8'h80;
-    reg [7:0] clkdiv;
-
-    assign clk_256fs = clk_12m;
-    assign clk_fs = clkdiv[7];
-	assign rst_i = rst_cnt[7];
 
 `ifndef VERILATOR_LINT_ONLY
 	// The Pico-Ice V3 examples seem to use the internal ICE40 HFOSC
@@ -28,18 +21,14 @@ module sysmgr (
     );
 `endif
 
-
+	// Logic reset generation
 	always @(posedge clk_12m or posedge rst_in)
 		if (rst_in)
 			rst_cnt <= 8'h80;
 		else if (rst_cnt[7])
 			rst_cnt <= rst_cnt + 1;
 
-    always @(posedge clk_256fs)
-        if (rst_i)
-            clkdiv <= 8'h00;
-        else
-            clkdiv <= clkdiv + 1;
+	assign rst_i = rst_cnt[7];
 
 `ifndef VERILATOR_LINT_ONLY
 	SB_GB rst_gbuf_I (

gateware/cal/cal.sv

@@ -20,8 +20,8 @@ module cal #(
     parameter W = 16, // sample width
     parameter CAL_MEM_FILE = "cal/cal_mem.hex"
 )(
-    input clk_256fs,
-    input clk_fs,
+    input clk, // 12Mhz
+    input sample_clk,
     input [7:0] jack,
     input signed [W-1:0] in0,
     input signed [W-1:0] in1,
@@ -59,16 +59,16 @@ logic signed [W-1:0]     cal_mem [0:(2*N_CHANNELS)-1];
 logic signed [(2*W)-1:0] out     [N_CHANNELS];
 logic        [2:0]       ch      = 0;
 logic        [2:0]       state   = CAL_ST_ZERO;
-logic               l_clk_fs = 1'd0;
+logic               l_sample_clk = 1'd0;
 
 // Calibration memory for 8 channels stored as
 // 2 bytes shift, 2 bytes multiply * 8 channels.
 initial $readmemh(CAL_MEM_FILE, cal_mem);
 
-always_ff @(posedge clk_256fs) begin
+always_ff @(posedge clk) begin
 
-    // On rising clk_fs.
-    if (clk_fs && (l_clk_fs != clk_fs)) begin
+    // On rising sample_clk.
+    if (sample_clk && (l_sample_clk != sample_clk)) begin
         state <= CAL_ST_LATCH;
         ch <= 0;
     end else begin
@@ -122,7 +122,7 @@ always_ff @(posedge clk_256fs) begin
         end
     endcase
 
-    l_clk_fs <= clk_fs;
+    l_sample_clk <= sample_clk;
 end
 
 `ifdef COCOTB_SIM

gateware/cal/debug_uart.sv

@@ -11,7 +11,7 @@ module debug_uart #(
     parameter W = 16, // sample width
     parameter DIV = 12 // baud rate == CLK / DIV
 )(
-    input clk,
+    input clk, // 12Mhz
     input rst,
     output tx_o,
     input [7:0] eeprom_mfg,

gateware/cores/util/vco/gen_v_oct_lut.py

@@ -7,7 +7,7 @@ def volts_to_freq(volts, a3_freq_hz=440.0):
     """Convert volts/oct (C3 == +3.0V) to frequency (Hz)."""
     return (a3_freq_hz / 8.0) * 2 ** (volts - 3.0/4.0)
 
-def volts_to_delta(volts, wavetable_n_samples=256, sample_rate_hz=46875):
+def volts_to_delta(volts, wavetable_n_samples=256, sample_rate_hz=93750):
     """Index delta (fractional) for wavetable per sample clock)."""
     return (wavetable_n_samples / sample_rate_hz) * volts_to_freq(volts)
 

gateware/cores/util/vco/gen_wavetable.py

@@ -2,23 +2,18 @@
 
 import math
 
-import matplotlib.pyplot as plt
-
 N = 256
 
-values = []
-
 with open("wavetable.hex", "w") as f:
     for i in range(N):
         # 3 sine waves and a sawtooth on top of each other.
-        value = i/N - 0.5
+        value = (1.0*math.sin(2*math.pi*i/N) +
+                 0.5*math.sin(4*math.pi*i/N) +
+                 0.3*math.sin(6*math.pi*i/N) +
+                 (0.2*i/N - 0.5))/2)
         # Scale up to fit inside 16 bit integer and use 2s comp for negative.
         value = int((1<<14) * value)
-        values.append(value)
         if value < 0:
             value = 0xffff + value
         line = "{:04x}\n".format(value)
         f.write(line)
-
-plt.plot(values)
-plt.show()