[top] Fix pinmux reset assignment
Pinmux was assigned the wrong root reset and as a result was
still held in reset with the strap signal was received.
This means pinmux does not actually perform the strapping function
since all its logic is held in reset.
Fixes #9365
Signed-off-by: Timothy Chen <timothytim@google.com>
diff --git a/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson b/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson
index 8125638..48075a7 100644
--- a/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson
+++ b/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson
@@ -3233,12 +3233,12 @@
{
rst_ni:
{
- name: sys_io_div4
+ name: por_io_div4
domain: Aon
}
rst_aon_ni:
{
- name: sys_aon
+ name: por_aon
domain: Aon
}
}
@@ -13452,8 +13452,8 @@
type: alert
async: "1"
module_name: pinmux_aon
- lpg_name: powerup_sys_io_div4_Aon
- lpg_idx: 13
+ lpg_name: powerup_por_io_div4_Aon
+ lpg_idx: 10
}
{
name: aon_timer_aon_fatal_fault
diff --git a/hw/top_earlgrey/data/top_earlgrey.hjson b/hw/top_earlgrey/data/top_earlgrey.hjson
index b10e836..6ffbd07 100644
--- a/hw/top_earlgrey/data/top_earlgrey.hjson
+++ b/hw/top_earlgrey/data/top_earlgrey.hjson
@@ -433,7 +433,7 @@
type: "pinmux",
clock_srcs: {clk_i: "io_div4", clk_aon_i: "aon"},
clock_group: "powerup",
- reset_connections: {rst_ni: "sys_io_div4", rst_aon_ni: "sys_aon"},
+ reset_connections: {rst_ni: "por_io_div4", rst_aon_ni: "por_aon"},
domain: ["Aon"],
base_addr: "0x40460000",
attr: "templated",
diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/data/alert_handler.hjson b/hw/top_earlgrey/ip_autogen/alert_handler/data/alert_handler.hjson
index 25c8773..d394f78 100644
--- a/hw/top_earlgrey/ip_autogen/alert_handler/data/alert_handler.hjson
+++ b/hw/top_earlgrey/ip_autogen/alert_handler/data/alert_handler.hjson
@@ -85,7 +85,7 @@
5'd15,
5'd15,
5'd14,
- 5'd13,
+ 5'd10,
5'd13,
5'd12,
5'd11,
diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/data/top_earlgrey_alert_handler.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/alert_handler/data/top_earlgrey_alert_handler.ipconfig.hjson
index ecbb162..0299b77 100644
--- a/hw/top_earlgrey/ip_autogen/alert_handler/data/top_earlgrey_alert_handler.ipconfig.hjson
+++ b/hw/top_earlgrey/ip_autogen/alert_handler/data/top_earlgrey_alert_handler.ipconfig.hjson
@@ -100,7 +100,7 @@
5'd11
5'd12
5'd13
- 5'd13
+ 5'd10
5'd14
5'd15
5'd15
diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/rtl/alert_handler_reg_pkg.sv b/hw/top_earlgrey/ip_autogen/alert_handler/rtl/alert_handler_reg_pkg.sv
index 8f8fedc..fec69dc 100644
--- a/hw/top_earlgrey/ip_autogen/alert_handler/rtl/alert_handler_reg_pkg.sv
+++ b/hw/top_earlgrey/ip_autogen/alert_handler/rtl/alert_handler_reg_pkg.sv
@@ -41,7 +41,7 @@
5'd15,
5'd15,
5'd14,
- 5'd13,
+ 5'd10,
5'd13,
5'd12,
5'd11,
diff --git a/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv b/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv
index 5f81d35..52323d4 100644
--- a/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv
+++ b/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv
@@ -1908,8 +1908,8 @@
// Clock and reset connections
.clk_i (clkmgr_aon_clocks.clk_io_div4_powerup),
.clk_aon_i (clkmgr_aon_clocks.clk_aon_powerup),
- .rst_ni (rstmgr_aon_resets.rst_sys_io_div4_n[rstmgr_pkg::DomainAonSel]),
- .rst_aon_ni (rstmgr_aon_resets.rst_sys_aon_n[rstmgr_pkg::DomainAonSel])
+ .rst_ni (rstmgr_aon_resets.rst_por_io_div4_n[rstmgr_pkg::DomainAonSel]),
+ .rst_aon_ni (rstmgr_aon_resets.rst_por_aon_n[rstmgr_pkg::DomainAonSel])
);
aon_timer #(
.AlertAsyncOn(alert_handler_reg_pkg::AsyncOn[28:28])
