[top] - hjson update

- Move pinmux use of fixed clock to io_clk

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 af74da3..5fac8d6 100644
--- a/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson
+++ b/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson
@@ -788,20 +788,20 @@
       clock_srcs:
       {
         clk_i: main
-        clk_aon_i: fixed
+        clk_aon_i: io
       }
       clock_group: secure
       reset_connections:
       {
         rst_ni: sys
-        rst_aon_ni: sys_fixed
+        rst_aon_ni: sys_io
       }
       base_addr: 0x40070000
       generated: "true"
       clock_connections:
       {
         clk_i: clkmgr_clocks.clk_main_secure
-        clk_aon_i: clkmgr_clocks.clk_fixed_secure
+        clk_aon_i: clkmgr_clocks.clk_io_secure
       }
       size: 0x1000
       bus_device: tlul
diff --git a/hw/top_earlgrey/data/top_earlgrey.hjson b/hw/top_earlgrey/data/top_earlgrey.hjson
index a6f2b12..b9c54fe 100644
--- a/hw/top_earlgrey/data/top_earlgrey.hjson
+++ b/hw/top_earlgrey/data/top_earlgrey.hjson
@@ -178,9 +178,9 @@
     { name: "pinmux",
       type: "pinmux",
       clock: "main",
-      clock_srcs: {clk_i: "main", clk_aon_i: "fixed"},
+      clock_srcs: {clk_i: "main", clk_aon_i: "io"},
       clock_group: "secure",
-      reset_connections: {rst_ni: "sys", rst_aon_ni: "sys_fixed"},
+      reset_connections: {rst_ni: "sys", rst_aon_ni: "sys_io"},
       base_addr: "0x40070000",
       generated: "true"
     },
diff --git a/hw/top_earlgrey/dv/chip_sim_cfg.hjson b/hw/top_earlgrey/dv/chip_sim_cfg.hjson
index a6b6797..1d7152b 100644
--- a/hw/top_earlgrey/dv/chip_sim_cfg.hjson
+++ b/hw/top_earlgrey/dv/chip_sim_cfg.hjson
@@ -111,6 +111,7 @@
       name: chip_flash_ctrl_test
       uvm_test_seq: chip_sw_test_base_vseq
       sw_test: sw/device/tests/flash_ctrl_test
+      run_opts: ["+sw_test_timeout_ns=3000000"]
     }
     {
       name: chip_sha256_test
diff --git a/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv b/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv
index 1f60fad..7b1f1c5 100644
--- a/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv
+++ b/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv
@@ -638,9 +638,9 @@
       .dio_in_i,
 
       .clk_i (clkmgr_clocks.clk_main_secure),
-      .clk_aon_i (clkmgr_clocks.clk_fixed_secure),
+      .clk_aon_i (clkmgr_clocks.clk_io_secure),
       .rst_ni (rstmgr_resets.rst_sys_n),
-      .rst_aon_ni (rstmgr_resets.rst_sys_fixed_n)
+      .rst_aon_ni (rstmgr_resets.rst_sys_io_n)
   );
 
   padctrl u_padctrl (