[RTL] Move inverter from top level to HK

- fixed clock connection to the digital_pll and caravel_clocking
- renamed power pins of the HK/caravel_clocking to VPWR/VGND
This commit is contained in:
manarabdelaty 2021-11-16 13:59:17 +02:00
parent bb1c9fe528
commit d7ae2e1ac1
3 changed files with 20 additions and 16 deletions

View File

@ -605,12 +605,12 @@ module caravel (
// Clocking control
caravel_clocking clocking(
`ifdef USE_POWER_PINS
.vdd1v8(VPWR),
.vss(VGND),
`endif
`ifdef USE_POWER_PINS
.VPWR(VPWR),
.VGND(VGND),
`endif
.ext_clk_sel(ext_clk_sel),
.ext_clk(clock),
.ext_clk(clock_core),
.pll_clk(pll_clk),
.pll_clk90(pll_clk90),
.resetb(resetb),
@ -631,7 +631,7 @@ module caravel (
`endif
.resetb(resetb),
.enable(spi_pll_ena),
.osc(clock),
.osc(clock_core),
.clockp({pll_clk, pll_clk90}),
.div(spi_pll_div),
.dco(spi_pll_dco_ena),
@ -641,13 +641,13 @@ module caravel (
// Housekeeping interface
housekeeping housekeeping (
`ifdef USE_POWER_PINS
.vdd(VPWR),
.vss(VGND),
`endif
`ifdef USE_POWER_PINS
.VPWR(VPWR),
.VGND(VGND),
`endif
.wb_clk_i(caravel_clk),
.wb_rst_i(~caravel_rstn),
.wb_rstn_i(caravel_rstn),
.wb_adr_i(mprj_adr_o_core),
.wb_dat_i(mprj_dat_o_core),

View File

@ -18,8 +18,8 @@
module caravel_clocking(
`ifdef USE_POWER_PINS
input vdd1v8,
input vss,
input VPWR,
input VGND,
`endif
input resetb, // Master (negative sense) reset
input ext_clk_sel, // 0=use PLL clock, 1=use external (pad) clock

View File

@ -61,13 +61,13 @@ module housekeeping #(
parameter IO_CTRL_BITS = 13
) (
`ifdef USE_POWER_PINS
inout vdd,
inout vss,
inout VPWR,
inout VGND,
`endif
// Wishbone interface to management SoC
input wb_clk_i,
input wb_rst_i,
input wb_rstn_i,
input [31:0] wb_adr_i,
input [31:0] wb_dat_i,
input [3:0] wb_sel_i,
@ -260,6 +260,10 @@ module housekeeping #(
assign reset = (pass_thru_mgmt_reset) ? 1'b1 : reset_reg;
// Invert wb_rstn_i
wire wb_rst_i;
assign wb_rst_i = ~wb_rstn_i;
// Handle the management-side control of the GPIO pins. All but the
// first and last three GPIOs (0, 1 and 35 to 37) are one-pin interfaces with
// a single I/O pin whose direction is determined by the local OEB signal.