[sysrst_ctrl] rename rbox to sysrst_ctrl

Signed-off-by: Eric Shiu <eshiu@google.com>
diff --git a/hw/Makefile b/hw/Makefile
index ff2d2d2..0455630 100644
--- a/hw/Makefile
+++ b/hw/Makefile
@@ -30,7 +30,6 @@
        pattgen       \
        pinmux        \
        pwrmgr        \
-       rbox          \
        rstmgr        \
        rv_plic       \
        rv_timer      \
@@ -38,6 +37,7 @@
        spi_device    \
        spi_host      \
        sram_ctrl     \
+       sysrst_ctrl   \
        trial1        \
        otbn          \
        uart          \
diff --git a/hw/ip/rbox/rtl/rbox_intr.sv b/hw/ip/rbox/rtl/rbox_intr.sv
deleted file mode 100644
index 2355b30..0000000
--- a/hw/ip/rbox/rtl/rbox_intr.sv
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-//
-// Description: RBOX interrupt Module
-//
-module rbox_intr import rbox_reg_pkg::*; (
-  input  clk_i,
-  input  rst_ni,
-  input  rbox_combo_intr,
-  input  rbox_key_intr,
-  input  rbox_reg2hw_intr_state_reg_t intr_state_i,
-  input  rbox_reg2hw_intr_enable_reg_t intr_enable_i,
-  input  rbox_reg2hw_intr_test_reg_t intr_test_i,
-  output rbox_hw2reg_intr_state_reg_t intr_state_o,
-  output rbox_intr_o
-);
-
-  logic rbox_event;
-
-  assign rbox_event = rbox_combo_intr | rbox_key_intr;
-
-  // instantiate interrupt hardware primitive
-  prim_intr_hw #(.Width(1)) i_rbox_intr_o (
-    .clk_i(clk_i),
-    .rst_ni(rst_ni),
-    .event_intr_i           (rbox_event),
-    .reg2hw_intr_enable_q_i (intr_enable_i.q),
-    .reg2hw_intr_test_q_i   (intr_test_i.q),
-    .reg2hw_intr_test_qe_i  (intr_test_i.qe),
-    .reg2hw_intr_state_q_i  (intr_state_i.q),
-    .hw2reg_intr_state_de_o (intr_state_o.de),
-    .hw2reg_intr_state_d_o  (intr_state_o.d),
-    .intr_o                 (rbox_intr_o)
-  );
-
-endmodule
diff --git a/hw/ip/rbox/rtl/rbox_reg_pkg.sv b/hw/ip/rbox/rtl/rbox_reg_pkg.sv
deleted file mode 100644
index b4ee2ee..0000000
--- a/hw/ip/rbox/rtl/rbox_reg_pkg.sv
+++ /dev/null
@@ -1,493 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-//
-// Register Package auto-generated by `reggen` containing data structure
-
-package rbox_reg_pkg;
-
-  // Param list
-  parameter int NumCombo = 4;
-
-  // Address widths within the block
-  parameter int BlockAw = 7;
-
-  ////////////////////////////
-  // Typedefs for registers //
-  ////////////////////////////
-
-  typedef struct packed {
-    logic        q;
-  } rbox_reg2hw_intr_state_reg_t;
-
-  typedef struct packed {
-    logic        q;
-  } rbox_reg2hw_intr_enable_reg_t;
-
-  typedef struct packed {
-    logic        q;
-    logic        qe;
-  } rbox_reg2hw_intr_test_reg_t;
-
-  typedef struct packed {
-    logic [15:0] q;
-    logic        qe;
-  } rbox_reg2hw_ec_rst_ctl_reg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic        q;
-    } key0_in;
-    struct packed {
-      logic        q;
-    } key0_out;
-    struct packed {
-      logic        q;
-    } key1_in;
-    struct packed {
-      logic        q;
-    } key1_out;
-    struct packed {
-      logic        q;
-    } key2_in;
-    struct packed {
-      logic        q;
-    } key2_out;
-    struct packed {
-      logic        q;
-    } pwrb_in;
-    struct packed {
-      logic        q;
-    } pwrb_out;
-    struct packed {
-      logic        q;
-    } ac_present;
-    struct packed {
-      logic        q;
-    } bat_disable;
-  } rbox_reg2hw_key_invert_ctl_reg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic        q;
-    } bat_disable_0;
-    struct packed {
-      logic        q;
-    } ec_rst_l_0;
-    struct packed {
-      logic        q;
-    } pwrb_out_0;
-    struct packed {
-      logic        q;
-    } key0_out_0;
-    struct packed {
-      logic        q;
-    } key1_out_0;
-    struct packed {
-      logic        q;
-    } key2_out_0;
-    struct packed {
-      logic        q;
-    } bat_disable_1;
-    struct packed {
-      logic        q;
-    } ec_rst_l_1;
-    struct packed {
-      logic        q;
-    } pwrb_out_1;
-    struct packed {
-      logic        q;
-    } key0_out_1;
-    struct packed {
-      logic        q;
-    } key1_out_1;
-    struct packed {
-      logic        q;
-    } key2_out_1;
-  } rbox_reg2hw_pin_allowed_ctl_reg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic        q;
-    } bat_disable;
-    struct packed {
-      logic        q;
-    } ec_rst_l;
-    struct packed {
-      logic        q;
-    } pwrb_out;
-    struct packed {
-      logic        q;
-    } key0_out;
-    struct packed {
-      logic        q;
-    } key1_out;
-    struct packed {
-      logic        q;
-    } key2_out;
-  } rbox_reg2hw_pin_out_ctl_reg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic        q;
-    } bat_disable;
-    struct packed {
-      logic        q;
-    } ec_rst_l;
-    struct packed {
-      logic        q;
-    } pwrb_out;
-    struct packed {
-      logic        q;
-    } key0_out;
-    struct packed {
-      logic        q;
-    } key1_out;
-    struct packed {
-      logic        q;
-    } key2_out;
-  } rbox_reg2hw_pin_out_value_reg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic        q;
-    } pwrb_in_h2l;
-    struct packed {
-      logic        q;
-    } key0_in_h2l;
-    struct packed {
-      logic        q;
-    } key1_in_h2l;
-    struct packed {
-      logic        q;
-    } key2_in_h2l;
-    struct packed {
-      logic        q;
-    } ac_present_h2l;
-    struct packed {
-      logic        q;
-    } ec_rst_l_h2l;
-    struct packed {
-      logic        q;
-    } pwrb_in_l2h;
-    struct packed {
-      logic        q;
-    } key0_in_l2h;
-    struct packed {
-      logic        q;
-    } key1_in_l2h;
-    struct packed {
-      logic        q;
-    } key2_in_l2h;
-    struct packed {
-      logic        q;
-    } ac_present_l2h;
-    struct packed {
-      logic        q;
-    } ec_rst_l_l2h;
-  } rbox_reg2hw_key_intr_ctl_reg_t;
-
-  typedef struct packed {
-    logic [15:0] q;
-    logic        qe;
-  } rbox_reg2hw_key_intr_debounce_ctl_reg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic [15:0] q;
-      logic        qe;
-    } debounce_timer;
-    struct packed {
-      logic        q;
-      logic        qe;
-    } auto_block_enable;
-  } rbox_reg2hw_auto_block_debounce_ctl_reg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic        q;
-    } key0_out_sel;
-    struct packed {
-      logic        q;
-    } key1_out_sel;
-    struct packed {
-      logic        q;
-    } key2_out_sel;
-    struct packed {
-      logic        q;
-    } key0_out_value;
-    struct packed {
-      logic        q;
-    } key1_out_value;
-    struct packed {
-      logic        q;
-    } key2_out_value;
-  } rbox_reg2hw_auto_block_out_ctl_reg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic        q;
-    } key0_in_sel;
-    struct packed {
-      logic        q;
-    } key1_in_sel;
-    struct packed {
-      logic        q;
-    } key2_in_sel;
-    struct packed {
-      logic        q;
-    } pwrb_in_sel;
-    struct packed {
-      logic        q;
-    } ac_present_sel;
-  } rbox_reg2hw_com_sel_ctl_mreg_t;
-
-  typedef struct packed {
-    logic [31:0] q;
-    logic        qe;
-  } rbox_reg2hw_com_det_ctl_mreg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic        q;
-    } bat_disable;
-    struct packed {
-      logic        q;
-    } interrupt;
-    struct packed {
-      logic        q;
-    } ec_rst;
-    struct packed {
-      logic        q;
-    } gsc_rst;
-  } rbox_reg2hw_com_out_ctl_mreg_t;
-
-  typedef struct packed {
-    logic        d;
-    logic        de;
-  } rbox_hw2reg_intr_state_reg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic        d;
-      logic        de;
-    } ac_present;
-    struct packed {
-      logic        d;
-      logic        de;
-    } ec_rst_l;
-    struct packed {
-      logic        d;
-      logic        de;
-    } pwrb_in;
-    struct packed {
-      logic        d;
-      logic        de;
-    } key0_in;
-    struct packed {
-      logic        d;
-      logic        de;
-    } key1_in;
-    struct packed {
-      logic        d;
-      logic        de;
-    } key2_in;
-  } rbox_hw2reg_pin_in_value_reg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic        d;
-      logic        de;
-    } combo0_h2l;
-    struct packed {
-      logic        d;
-      logic        de;
-    } combo1_h2l;
-    struct packed {
-      logic        d;
-      logic        de;
-    } combo2_h2l;
-    struct packed {
-      logic        d;
-      logic        de;
-    } combo3_h2l;
-  } rbox_hw2reg_combo_intr_status_reg_t;
-
-  typedef struct packed {
-    struct packed {
-      logic        d;
-      logic        de;
-    } pwrb_h2l;
-    struct packed {
-      logic        d;
-      logic        de;
-    } key0_in_h2l;
-    struct packed {
-      logic        d;
-      logic        de;
-    } key1_in_h2l;
-    struct packed {
-      logic        d;
-      logic        de;
-    } key2_in_h2l;
-    struct packed {
-      logic        d;
-      logic        de;
-    } ac_present_h2l;
-    struct packed {
-      logic        d;
-      logic        de;
-    } ec_rst_l_h2l;
-    struct packed {
-      logic        d;
-      logic        de;
-    } pwrb_l2h;
-    struct packed {
-      logic        d;
-      logic        de;
-    } key0_in_l2h;
-    struct packed {
-      logic        d;
-      logic        de;
-    } key1_in_l2h;
-    struct packed {
-      logic        d;
-      logic        de;
-    } key2_in_l2h;
-    struct packed {
-      logic        d;
-      logic        de;
-    } ac_present_l2h;
-    struct packed {
-      logic        d;
-      logic        de;
-    } ec_rst_l_l2h;
-  } rbox_hw2reg_key_intr_status_reg_t;
-
-  // Register -> HW type
-  typedef struct packed {
-    rbox_reg2hw_intr_state_reg_t intr_state; // [276:276]
-    rbox_reg2hw_intr_enable_reg_t intr_enable; // [275:275]
-    rbox_reg2hw_intr_test_reg_t intr_test; // [274:273]
-    rbox_reg2hw_ec_rst_ctl_reg_t ec_rst_ctl; // [272:256]
-    rbox_reg2hw_key_invert_ctl_reg_t key_invert_ctl; // [255:246]
-    rbox_reg2hw_pin_allowed_ctl_reg_t pin_allowed_ctl; // [245:234]
-    rbox_reg2hw_pin_out_ctl_reg_t pin_out_ctl; // [233:228]
-    rbox_reg2hw_pin_out_value_reg_t pin_out_value; // [227:222]
-    rbox_reg2hw_key_intr_ctl_reg_t key_intr_ctl; // [221:210]
-    rbox_reg2hw_key_intr_debounce_ctl_reg_t key_intr_debounce_ctl; // [209:193]
-    rbox_reg2hw_auto_block_debounce_ctl_reg_t auto_block_debounce_ctl; // [192:174]
-    rbox_reg2hw_auto_block_out_ctl_reg_t auto_block_out_ctl; // [173:168]
-    rbox_reg2hw_com_sel_ctl_mreg_t [3:0] com_sel_ctl; // [167:148]
-    rbox_reg2hw_com_det_ctl_mreg_t [3:0] com_det_ctl; // [147:16]
-    rbox_reg2hw_com_out_ctl_mreg_t [3:0] com_out_ctl; // [15:0]
-  } rbox_reg2hw_t;
-
-  // HW -> register type
-  typedef struct packed {
-    rbox_hw2reg_intr_state_reg_t intr_state; // [45:44]
-    rbox_hw2reg_pin_in_value_reg_t pin_in_value; // [43:32]
-    rbox_hw2reg_combo_intr_status_reg_t combo_intr_status; // [31:24]
-    rbox_hw2reg_key_intr_status_reg_t key_intr_status; // [23:0]
-  } rbox_hw2reg_t;
-
-  // Register offsets
-  parameter logic [BlockAw-1:0] RBOX_INTR_STATE_OFFSET = 7'h 0;
-  parameter logic [BlockAw-1:0] RBOX_INTR_ENABLE_OFFSET = 7'h 4;
-  parameter logic [BlockAw-1:0] RBOX_INTR_TEST_OFFSET = 7'h 8;
-  parameter logic [BlockAw-1:0] RBOX_REGWEN_OFFSET = 7'h c;
-  parameter logic [BlockAw-1:0] RBOX_EC_RST_CTL_OFFSET = 7'h 10;
-  parameter logic [BlockAw-1:0] RBOX_KEY_INVERT_CTL_OFFSET = 7'h 14;
-  parameter logic [BlockAw-1:0] RBOX_PIN_ALLOWED_CTL_OFFSET = 7'h 18;
-  parameter logic [BlockAw-1:0] RBOX_PIN_OUT_CTL_OFFSET = 7'h 1c;
-  parameter logic [BlockAw-1:0] RBOX_PIN_OUT_VALUE_OFFSET = 7'h 20;
-  parameter logic [BlockAw-1:0] RBOX_PIN_IN_VALUE_OFFSET = 7'h 24;
-  parameter logic [BlockAw-1:0] RBOX_KEY_INTR_CTL_OFFSET = 7'h 28;
-  parameter logic [BlockAw-1:0] RBOX_KEY_INTR_DEBOUNCE_CTL_OFFSET = 7'h 2c;
-  parameter logic [BlockAw-1:0] RBOX_AUTO_BLOCK_DEBOUNCE_CTL_OFFSET = 7'h 30;
-  parameter logic [BlockAw-1:0] RBOX_AUTO_BLOCK_OUT_CTL_OFFSET = 7'h 34;
-  parameter logic [BlockAw-1:0] RBOX_COM_SEL_CTL_0_OFFSET = 7'h 38;
-  parameter logic [BlockAw-1:0] RBOX_COM_SEL_CTL_1_OFFSET = 7'h 3c;
-  parameter logic [BlockAw-1:0] RBOX_COM_SEL_CTL_2_OFFSET = 7'h 40;
-  parameter logic [BlockAw-1:0] RBOX_COM_SEL_CTL_3_OFFSET = 7'h 44;
-  parameter logic [BlockAw-1:0] RBOX_COM_DET_CTL_0_OFFSET = 7'h 48;
-  parameter logic [BlockAw-1:0] RBOX_COM_DET_CTL_1_OFFSET = 7'h 4c;
-  parameter logic [BlockAw-1:0] RBOX_COM_DET_CTL_2_OFFSET = 7'h 50;
-  parameter logic [BlockAw-1:0] RBOX_COM_DET_CTL_3_OFFSET = 7'h 54;
-  parameter logic [BlockAw-1:0] RBOX_COM_OUT_CTL_0_OFFSET = 7'h 58;
-  parameter logic [BlockAw-1:0] RBOX_COM_OUT_CTL_1_OFFSET = 7'h 5c;
-  parameter logic [BlockAw-1:0] RBOX_COM_OUT_CTL_2_OFFSET = 7'h 60;
-  parameter logic [BlockAw-1:0] RBOX_COM_OUT_CTL_3_OFFSET = 7'h 64;
-  parameter logic [BlockAw-1:0] RBOX_COMBO_INTR_STATUS_OFFSET = 7'h 68;
-  parameter logic [BlockAw-1:0] RBOX_KEY_INTR_STATUS_OFFSET = 7'h 6c;
-
-  // Reset values for hwext registers and their fields
-  parameter logic [0:0] RBOX_INTR_TEST_RESVAL = 1'h 0;
-  parameter logic [0:0] RBOX_INTR_TEST_RBOX_INTR_O_RESVAL = 1'h 0;
-
-  // Register index
-  typedef enum int {
-    RBOX_INTR_STATE,
-    RBOX_INTR_ENABLE,
-    RBOX_INTR_TEST,
-    RBOX_REGWEN,
-    RBOX_EC_RST_CTL,
-    RBOX_KEY_INVERT_CTL,
-    RBOX_PIN_ALLOWED_CTL,
-    RBOX_PIN_OUT_CTL,
-    RBOX_PIN_OUT_VALUE,
-    RBOX_PIN_IN_VALUE,
-    RBOX_KEY_INTR_CTL,
-    RBOX_KEY_INTR_DEBOUNCE_CTL,
-    RBOX_AUTO_BLOCK_DEBOUNCE_CTL,
-    RBOX_AUTO_BLOCK_OUT_CTL,
-    RBOX_COM_SEL_CTL_0,
-    RBOX_COM_SEL_CTL_1,
-    RBOX_COM_SEL_CTL_2,
-    RBOX_COM_SEL_CTL_3,
-    RBOX_COM_DET_CTL_0,
-    RBOX_COM_DET_CTL_1,
-    RBOX_COM_DET_CTL_2,
-    RBOX_COM_DET_CTL_3,
-    RBOX_COM_OUT_CTL_0,
-    RBOX_COM_OUT_CTL_1,
-    RBOX_COM_OUT_CTL_2,
-    RBOX_COM_OUT_CTL_3,
-    RBOX_COMBO_INTR_STATUS,
-    RBOX_KEY_INTR_STATUS
-  } rbox_id_e;
-
-  // Register width information to check illegal writes
-  parameter logic [3:0] RBOX_PERMIT [28] = '{
-    4'b 0001, // index[ 0] RBOX_INTR_STATE
-    4'b 0001, // index[ 1] RBOX_INTR_ENABLE
-    4'b 0001, // index[ 2] RBOX_INTR_TEST
-    4'b 0001, // index[ 3] RBOX_REGWEN
-    4'b 0011, // index[ 4] RBOX_EC_RST_CTL
-    4'b 0011, // index[ 5] RBOX_KEY_INVERT_CTL
-    4'b 0011, // index[ 6] RBOX_PIN_ALLOWED_CTL
-    4'b 0001, // index[ 7] RBOX_PIN_OUT_CTL
-    4'b 0001, // index[ 8] RBOX_PIN_OUT_VALUE
-    4'b 0001, // index[ 9] RBOX_PIN_IN_VALUE
-    4'b 0011, // index[10] RBOX_KEY_INTR_CTL
-    4'b 0011, // index[11] RBOX_KEY_INTR_DEBOUNCE_CTL
-    4'b 0111, // index[12] RBOX_AUTO_BLOCK_DEBOUNCE_CTL
-    4'b 0001, // index[13] RBOX_AUTO_BLOCK_OUT_CTL
-    4'b 0001, // index[14] RBOX_COM_SEL_CTL_0
-    4'b 0001, // index[15] RBOX_COM_SEL_CTL_1
-    4'b 0001, // index[16] RBOX_COM_SEL_CTL_2
-    4'b 0001, // index[17] RBOX_COM_SEL_CTL_3
-    4'b 1111, // index[18] RBOX_COM_DET_CTL_0
-    4'b 1111, // index[19] RBOX_COM_DET_CTL_1
-    4'b 1111, // index[20] RBOX_COM_DET_CTL_2
-    4'b 1111, // index[21] RBOX_COM_DET_CTL_3
-    4'b 0001, // index[22] RBOX_COM_OUT_CTL_0
-    4'b 0001, // index[23] RBOX_COM_OUT_CTL_1
-    4'b 0001, // index[24] RBOX_COM_OUT_CTL_2
-    4'b 0001, // index[25] RBOX_COM_OUT_CTL_3
-    4'b 0001, // index[26] RBOX_COMBO_INTR_STATUS
-    4'b 0011  // index[27] RBOX_KEY_INTR_STATUS
-  };
-
-endpackage
-
diff --git a/hw/ip/rbox/data/rbox.hjson b/hw/ip/sysrst_ctrl/data/sysrst_ctrl.hjson
similarity index 97%
rename from hw/ip/rbox/data/rbox.hjson
rename to hw/ip/sysrst_ctrl/data/sysrst_ctrl.hjson
index c915b37..a5ddd74 100644
--- a/hw/ip/rbox/data/rbox.hjson
+++ b/hw/ip/sysrst_ctrl/data/sysrst_ctrl.hjson
@@ -1,7 +1,7 @@
 // Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
-{ name: "rbox",
+{ name: "sysrst_ctrl",
   clock_primary: "clk_i",
   other_clock_list: [
     "clk_aon_i"
@@ -14,8 +14,8 @@
     "rst_slow_ni"
   ],
   interrupt_list: [
-    { name: "rbox_intr_o",
-      desc: "combo or keyboard triggered interrupt",
+    { name: "sysrst_ctrl_common",
+      desc: "common interrupt triggered by combo or keyboard actions",
     }
   ],
   param_list: [
@@ -243,7 +243,7 @@
       ]
     }
     { name: "pin_in_value",
-      desc: "For SW to read the rbox inputs like GPIO",
+      desc: "For SW to read the sysrst_ctrl inputs like GPIO",
       swaccess: "ro",
       hwaccess: "hwo",
       resval: "0",
@@ -407,7 +407,7 @@
 	      HW will detect H2L transition in the combo use case
               ''',
         count: "NumCombo",
-        cname: "rbox",
+        cname: "sysrst_ctrl",
 	swaccess: "rw",
 	hwaccess: "hro",
         regwen:   "REGWEN",
@@ -442,7 +442,7 @@
 	      0-60s, each step is 5us(200KHz clock)
               ''',
         count: "NumCombo",
-        cname: "rbox",
+        cname: "sysrst_ctrl",
 	hwqe:  "true",
 	swaccess: "rw",
 	hwaccess: "hro",
@@ -465,7 +465,7 @@
               [3]: gsc_rst
               ''',
         count: "NumCombo",
-        cname: "rbox",
+        cname: "sysrst_ctrl",
 	swaccess: "rw",
 	hwaccess: "hro",
         regwen:   "REGWEN",
diff --git a/hw/ip/rbox/data/rbox.prj.hjson b/hw/ip/sysrst_ctrl/data/sysrst_ctrl.prj.hjson
similarity index 90%
rename from hw/ip/rbox/data/rbox.prj.hjson
rename to hw/ip/sysrst_ctrl/data/sysrst_ctrl.prj.hjson
index 1746eec..957e147 100644
--- a/hw/ip/rbox/data/rbox.prj.hjson
+++ b/hw/ip/sysrst_ctrl/data/sysrst_ctrl.prj.hjson
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 {
-    name:               "rbox",
+    name:               "sysrst_ctrl",
     design_spec:        "../doc",
     dv_doc:             "../doc/dv",
     hw_checklist:       "../doc/checklist",
diff --git a/hw/ip/rbox/rtl/rbox.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl.sv
similarity index 87%
rename from hw/ip/rbox/rtl/rbox.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl.sv
index d0ab6f8..8985d1f 100644
--- a/hw/ip/rbox/rtl/rbox.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl.sv
@@ -2,17 +2,17 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
-// rbox module
+// sysrst_ctrl module
 
 `include "prim_assert.sv"
 
-module rbox (
+module sysrst_ctrl (
   input clk_i,//Always-on 24MHz clock(config)
   input clk_aon_i,//Always-on 200KHz clock(logic)
   input rst_ni,//power-on reset for the 24MHz clock(config)
   input rst_slow_ni,//power-on reset for the 200KHz clock(logic)
   output gsc_rst_o,//GSC reset to rstmgr
-  output rbox_intr_o,//rbox interrupt to PLIC
+  output sysrst_ctrl_intr_o,//sysrst_ctrl interrupt to PLIC
 
   //Regster interface
   input  tlul_pkg::tl_h2d_t tl_i,
@@ -26,7 +26,7 @@
   input  cio_key2_in_i,//TBD button in tablet; row input from keyboard matrix in a laptop
   input  cio_pwrb_in_i,//Power button in both tablet and laptop
   output logic cio_bat_disable_o,//Battery is disconnected
-  output logic cio_ec_rst_l_o,//EC reset is asserted by rbox
+  output logic cio_ec_rst_l_o,//EC reset is asserted by sysrst_ctrl
   output logic cio_key0_out_o,//Passthrough from key0_in, can be configured to invert
   output logic cio_key1_out_o,//Passthrough from key1_in, can be configured to invert
   output logic cio_key2_out_o,//Passthrough from key2_in, can be configured to invert
@@ -39,15 +39,15 @@
   output logic cio_pwrb_out_en_o
 );
 
-  import rbox_reg_pkg::* ;
+  import sysrst_ctrl_reg_pkg::* ;
 
-  rbox_reg2hw_t reg2hw;
-  rbox_hw2reg_t hw2reg;
+  sysrst_ctrl_reg2hw_t reg2hw;
+  sysrst_ctrl_hw2reg_t hw2reg;
 
   logic pwrb_int, key0_int, key1_int, key2_int, ac_present_int;
   logic pwrb_out_hw, key0_out_hw, key1_out_hw, key2_out_hw, ec_rst_l_hw, bat_disable_hw;
   logic pwrb_out_int, key0_out_int, key1_out_int, key2_out_int, bat_disable_int;
-  logic rbox_combo_intr, rbox_key_intr;
+  logic sysrst_ctrl_combo_intr, sysrst_ctrl_key_intr;
   logic nc_intg_err_o;//FIXME
 
   //Always-on pins
@@ -59,7 +59,7 @@
   assign cio_bat_disable_en_o = 1'b1;
 
   // Register module
-  rbox_reg_top i_reg_top (
+  sysrst_ctrl_reg_top i_reg_top (
     .clk_i(clk_i),
     .rst_ni(rst_ni),
     .tl_i(tl_i),
@@ -71,7 +71,7 @@
   );
 
   //Instantiate the autoblock module
-  rbox_autoblock i_autoblock (
+  sysrst_ctrl_autoblock i_autoblock (
     .clk_i(clk_i),
     .rst_ni(rst_ni),
     .clk_aon_i(clk_aon_i),
@@ -89,7 +89,7 @@
   );
 
   //Instantiate the pin inversion module
-  rbox_inv i_inversion (
+  sysrst_ctrl_inv i_inversion (
     .clk_aon_i(clk_aon_i),
     .rst_slow_ni(rst_slow_ni),
     .cio_pwrb_in_i(cio_pwrb_in_i),
@@ -116,7 +116,7 @@
   );
 
   //Instantiate the pin visibility and override module
-  rbox_pin i_pin_vis_ovd (
+  sysrst_ctrl_pin i_pin_vis_ovd (
     .clk_i(clk_i),
     .rst_ni(rst_ni),
     .clk_aon_i(clk_aon_i),
@@ -146,7 +146,7 @@
   );
 
   //Instantiate key-triggered interrupt module
-  rbox_keyintr i_keyintr (
+  sysrst_ctrl_keyintr i_keyintr (
     .clk_i(clk_i),
     .rst_ni(rst_ni),
     .clk_aon_i(clk_aon_i),
@@ -160,11 +160,11 @@
     .key_intr_ctl_i(reg2hw.key_intr_ctl),
     .key_intr_debounce_ctl_i(reg2hw.key_intr_debounce_ctl),
     .key_intr_status_o(hw2reg.key_intr_status),
-    .rbox_key_intr(rbox_key_intr)
+    .sysrst_ctrl_key_intr(sysrst_ctrl_key_intr)
   );
 
   //Instantiate combo module
-  rbox_combo i_combo (
+  sysrst_ctrl_combo i_combo (
     .clk_i(clk_i),
     .rst_ni(rst_ni),
     .clk_aon_i(clk_aon_i),
@@ -181,27 +181,27 @@
     .com_det_ctl_i(reg2hw.com_det_ctl),
     .com_out_ctl_i(reg2hw.com_out_ctl),
     .combo_intr_status_o(hw2reg.combo_intr_status),
-    .rbox_combo_intr(rbox_combo_intr),
+    .sysrst_ctrl_combo_intr(sysrst_ctrl_combo_intr),
     .bat_disable_hw(bat_disable_hw),
     .gsc_rst_o(gsc_rst_o),
     .ec_rst_l_hw(ec_rst_l_hw)
   );
 
   //Instantiate the interrupt module
-  rbox_intr i_intr (
+  sysrst_ctrl_intr i_intr (
     .clk_i(clk_i),
     .rst_ni(rst_ni),
-    .rbox_combo_intr(rbox_combo_intr),
-    .rbox_key_intr(rbox_key_intr),
+    .sysrst_ctrl_combo_intr(sysrst_ctrl_combo_intr),
+    .sysrst_ctrl_key_intr(sysrst_ctrl_key_intr),
     .intr_state_i(reg2hw.intr_state),
     .intr_enable_i(reg2hw.intr_enable),
     .intr_test_i(reg2hw.intr_test),
     .intr_state_o(hw2reg.intr_state),
-    .rbox_intr_o(rbox_intr_o)
+    .sysrst_ctrl_intr_o(sysrst_ctrl_intr_o)
   );
 
   // All outputs should be known value after reset
-  `ASSERT_KNOWN(IntrRboxOKnown, rbox_intr_o)
+  `ASSERT_KNOWN(IntrSysRstCtrlOKnown, sysrst_ctrl_intr_o)
   `ASSERT_KNOWN(GSCRstOKnown, gsc_rst_l_o)
   `ASSERT_KNOWN(TlODValidKnown, tl_o.d_valid)
   `ASSERT_KNOWN(TlOAReadyKnown, tl_o.a_ready)
diff --git a/hw/ip/rbox/rtl/rbox_autoblock.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_autoblock.sv
similarity index 92%
rename from hw/ip/rbox/rtl/rbox_autoblock.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_autoblock.sv
index 87f94c3..9dc5367 100644
--- a/hw/ip/rbox/rtl/rbox_autoblock.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_autoblock.sv
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Description RBOX PWRB autoblock module
+// Description sysrst_ctrl PWRB autoblock module
 
-module rbox_autoblock import rbox_reg_pkg::*; (
+module sysrst_ctrl_autoblock import sysrst_ctrl_reg_pkg::*; (
   input  clk_aon_i,
   input  rst_slow_ni,
   input  clk_i,
@@ -15,8 +15,8 @@
   input  key1_int,
   input  key2_int,
 
-  input  rbox_reg2hw_auto_block_debounce_ctl_reg_t auto_block_debounce_ctl_i,
-  input  rbox_reg2hw_auto_block_out_ctl_reg_t      auto_block_out_ctl_i,
+  input  sysrst_ctrl_reg2hw_auto_block_debounce_ctl_reg_t auto_block_debounce_ctl_i,
+  input  sysrst_ctrl_reg2hw_auto_block_out_ctl_reg_t      auto_block_out_ctl_i,
 
   output pwrb_out_hw,
   output key0_out_hw,
@@ -145,7 +145,7 @@
     .q_o(pwrb_int_i)
   );
 
-  rbox_timerfsm # (
+  sysrst_ctrl_timerfsm # (
     .TIMERBIT(16)
   ) i_ab_fsm (
     .clk_aon_i(clk_aon_i),
diff --git a/hw/ip/rbox/rtl/rbox_combo.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_combo.sv
similarity index 91%
rename from hw/ip/rbox/rtl/rbox_combo.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_combo.sv
index f2fd25d..0070f33 100644
--- a/hw/ip/rbox/rtl/rbox_combo.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_combo.sv
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Description: RBOX combo Module
+// Description: sysrst_ctrl combo Module
 //
-module rbox_combo import rbox_reg_pkg::*; (
+module sysrst_ctrl_combo import sysrst_ctrl_reg_pkg::*; (
   input  clk_aon_i,
   input  rst_slow_ni,
   input  clk_i,
@@ -17,14 +17,14 @@
   input  ac_present_int,
   input  cio_ec_rst_l_i,
 
-  input  rbox_reg2hw_ec_rst_ctl_reg_t ec_rst_ctl_i,
-  input  rbox_reg2hw_key_intr_debounce_ctl_reg_t key_intr_debounce_ctl_i,
-  input  rbox_reg2hw_com_sel_ctl_mreg_t [NumCombo-1:0] com_sel_ctl_i,
-  input  rbox_reg2hw_com_det_ctl_mreg_t [NumCombo-1:0] com_det_ctl_i,
-  input  rbox_reg2hw_com_out_ctl_mreg_t [NumCombo-1:0] com_out_ctl_i,
+  input  sysrst_ctrl_reg2hw_ec_rst_ctl_reg_t ec_rst_ctl_i,
+  input  sysrst_ctrl_reg2hw_key_intr_debounce_ctl_reg_t key_intr_debounce_ctl_i,
+  input  sysrst_ctrl_reg2hw_com_sel_ctl_mreg_t [NumCombo-1:0] com_sel_ctl_i,
+  input  sysrst_ctrl_reg2hw_com_det_ctl_mreg_t [NumCombo-1:0] com_det_ctl_i,
+  input  sysrst_ctrl_reg2hw_com_out_ctl_mreg_t [NumCombo-1:0] com_out_ctl_i,
 
-  output rbox_hw2reg_combo_intr_status_reg_t combo_intr_status_o,
-  output rbox_combo_intr,
+  output sysrst_ctrl_hw2reg_combo_intr_status_reg_t combo_intr_status_o,
+  output sysrst_ctrl_combo_intr,
 
   output bat_disable_hw,
   output gsc_rst_o,
@@ -271,7 +271,7 @@
 
   //generate the trigger for each combo
   for (genvar k = 0 ; k < NumCombo ; k++) begin : gen_combo_trigger
-    rbox_combotrg i_combo_trg (
+    sysrst_ctrl_combotrg i_combo_trg (
       .cfg_in0_sel(cfg_pwrb_in_sel_com[k]),
       .cfg_in1_sel(cfg_key0_in_sel_com[k]),
       .cfg_in2_sel(cfg_key1_in_sel_com[k]),
@@ -292,7 +292,7 @@
 
   //Instantiate the combo detection state machine
   for (genvar k = 0 ; k < NumCombo ; k++) begin : gen_combofsm
-    rbox_combofsm # (
+    sysrst_ctrl_combofsm # (
       .TIMER1BIT(16),
       .TIMER2BIT(32)
     ) i_combo_fsm (
@@ -309,7 +309,7 @@
 
   //Instantiate the combo action module
   for (genvar k = 0 ; k < NumCombo ; k++) begin : gen_combo_act
-    rbox_comboact i_combo_act (
+    sysrst_ctrl_comboact i_combo_act (
       .clk_aon_i(clk_aon_i),
       .rst_slow_ni(rst_slow_ni),
       .clk_i(clk_i),
@@ -381,7 +381,7 @@
 
   assign combo_intr_status_o.combo3_h2l.de = combo3_h2l_intr;
 
-  assign rbox_combo_intr = combo0_h2l_intr | combo1_h2l_intr | combo2_h2l_intr | combo3_h2l_intr;
+  assign sysrst_ctrl_combo_intr = combo0_h2l_intr | combo1_h2l_intr | combo2_h2l_intr | combo3_h2l_intr;
 
   //To write into interrupt status register
   assign combo_intr_status_o.combo0_h2l.d = 1'b1;
diff --git a/hw/ip/rbox/rtl/rbox_comboact.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_comboact.sv
similarity index 95%
rename from hw/ip/rbox/rtl/rbox_comboact.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_comboact.sv
index 930c2db..054510d 100644
--- a/hw/ip/rbox/rtl/rbox_comboact.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_comboact.sv
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Description: RBOX combo action Module
+// Description: sysrst_ctrl combo action Module
 //
-module rbox_comboact import rbox_reg_pkg::*; (
+module sysrst_ctrl_comboact import sysrst_ctrl_reg_pkg::*; (
   input  clk_aon_i,
   input  rst_slow_ni,
   input  clk_i,
@@ -17,7 +17,7 @@
   input  combo_det,
   input  ec_rst_l_i,
 
-  input  rbox_reg2hw_ec_rst_ctl_reg_t ec_rst_ctl_i,
+  input  sysrst_ctrl_reg2hw_ec_rst_ctl_reg_t ec_rst_ctl_i,
 
   output combo_intr_pulse,
   output bat_disable_o,
diff --git a/hw/ip/rbox/rtl/rbox_combofsm.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_combofsm.sv
similarity index 97%
rename from hw/ip/rbox/rtl/rbox_combofsm.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_combofsm.sv
index 67ed3d4..96c6fd3 100644
--- a/hw/ip/rbox/rtl/rbox_combofsm.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_combofsm.sv
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Description RBOX combo detection FSM module
+// Description sysrst_ctrl combo detection FSM module
 
-module rbox_combofsm #(
+module sysrst_ctrl_combofsm #(
   parameter int unsigned TIMER1BIT = 16,
   parameter int unsigned TIMER2BIT = 32
   ) (
diff --git a/hw/ip/rbox/rtl/rbox_combotrg.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_combotrg.sv
similarity index 98%
rename from hw/ip/rbox/rtl/rbox_combotrg.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_combotrg.sv
index 20cb809..4e45cd5 100644
--- a/hw/ip/rbox/rtl/rbox_combotrg.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_combotrg.sv
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Description RBOX combo trigger  module
+// Description sysrst_ctrl combo trigger  module
 
-module rbox_combotrg (
+module sysrst_ctrl_combotrg (
   input                cfg_in0_sel,
   input                cfg_in1_sel,
   input                cfg_in2_sel,
diff --git a/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_intr.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_intr.sv
new file mode 100644
index 0000000..bc9a012
--- /dev/null
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_intr.sv
@@ -0,0 +1,37 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+//
+// Description: sysrst_ctrl interrupt Module
+//
+module sysrst_ctrl_intr import sysrst_ctrl_reg_pkg::*; (
+  input  clk_i,
+  input  rst_ni,
+  input  sysrst_ctrl_combo_intr,
+  input  sysrst_ctrl_key_intr,
+  input  sysrst_ctrl_reg2hw_intr_state_reg_t intr_state_i,
+  input  sysrst_ctrl_reg2hw_intr_enable_reg_t intr_enable_i,
+  input  sysrst_ctrl_reg2hw_intr_test_reg_t intr_test_i,
+  output sysrst_ctrl_hw2reg_intr_state_reg_t intr_state_o,
+  output sysrst_ctrl_intr_o
+);
+
+  logic sysrst_ctrl_event;
+
+  assign sysrst_ctrl_event = sysrst_ctrl_combo_intr | sysrst_ctrl_key_intr;
+
+  // instantiate interrupt hardware primitive
+  prim_intr_hw #(.Width(1)) i_sysrst_ctrl_intr_o (
+    .clk_i(clk_i),
+    .rst_ni(rst_ni),
+    .event_intr_i           (sysrst_ctrl_event),
+    .reg2hw_intr_enable_q_i (intr_enable_i.q),
+    .reg2hw_intr_test_q_i   (intr_test_i.q),
+    .reg2hw_intr_test_qe_i  (intr_test_i.qe),
+    .reg2hw_intr_state_q_i  (intr_state_i.q),
+    .hw2reg_intr_state_de_o (intr_state_o.de),
+    .hw2reg_intr_state_d_o  (intr_state_o.d),
+    .intr_o                 (sysrst_ctrl_intr_o)
+  );
+
+endmodule
diff --git a/hw/ip/rbox/rtl/rbox_inv.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_inv.sv
similarity index 94%
rename from hw/ip/rbox/rtl/rbox_inv.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_inv.sv
index cb63c6c..148782b 100644
--- a/hw/ip/rbox/rtl/rbox_inv.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_inv.sv
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Description: RBOX pin inversion Module
+// Description: sysrst_ctrl pin inversion Module
 //
 
-module rbox_inv import rbox_reg_pkg::*; (
+module sysrst_ctrl_inv import sysrst_ctrl_reg_pkg::*; (
   input  clk_aon_i,
   input  rst_slow_ni,
 
@@ -21,7 +21,7 @@
   input  key2_out_int,
   input  bat_disable_int,
 
-  input  rbox_reg2hw_key_invert_ctl_reg_t key_invert_ctl_i,
+  input  sysrst_ctrl_reg2hw_key_invert_ctl_reg_t key_invert_ctl_i,
 
   output pwrb_int,
   output key0_int,
diff --git a/hw/ip/rbox/rtl/rbox_keyfsm.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_keyfsm.sv
similarity index 97%
rename from hw/ip/rbox/rtl/rbox_keyfsm.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_keyfsm.sv
index 0a41a96..60c2e2d 100644
--- a/hw/ip/rbox/rtl/rbox_keyfsm.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_keyfsm.sv
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Description RBOX key press and release FSM module
+// Description sysrst_ctrl key press and release FSM module
 
-module rbox_keyfsm #(
+module sysrst_ctrl_keyfsm #(
   parameter int unsigned TIMERBIT = 16
   ) (
   input                clk_aon_i,
diff --git a/hw/ip/rbox/rtl/rbox_keyintr.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_keyintr.sv
similarity index 96%
rename from hw/ip/rbox/rtl/rbox_keyintr.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_keyintr.sv
index 906d7ff..cc94709 100644
--- a/hw/ip/rbox/rtl/rbox_keyintr.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_keyintr.sv
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Description: RBOX key-triggered interrupt Module
+// Description: sysrst_ctrl key-triggered interrupt Module
 //
-module rbox_keyintr import rbox_reg_pkg::*; (
+module sysrst_ctrl_keyintr import sysrst_ctrl_reg_pkg::*; (
   input  clk_aon_i,
   input  rst_slow_ni,
   input  clk_i,
@@ -17,11 +17,11 @@
   input  ac_present_int,
   input  cio_ec_rst_l_i,
 
-  input  rbox_reg2hw_key_intr_ctl_reg_t key_intr_ctl_i,
-  input  rbox_reg2hw_key_intr_debounce_ctl_reg_t key_intr_debounce_ctl_i,
+  input  sysrst_ctrl_reg2hw_key_intr_ctl_reg_t key_intr_ctl_i,
+  input  sysrst_ctrl_reg2hw_key_intr_debounce_ctl_reg_t key_intr_debounce_ctl_i,
 
-  output rbox_hw2reg_key_intr_status_reg_t key_intr_status_o,
-  output rbox_key_intr
+  output sysrst_ctrl_hw2reg_key_intr_status_reg_t key_intr_status_o,
+  output sysrst_ctrl_key_intr
 
 );
 
@@ -258,7 +258,7 @@
   );
 
   //Instantiate the key state machine
-  rbox_keyfsm # (
+  sysrst_ctrl_keyfsm # (
     .TIMERBIT(16)
   ) i_pwrbintr_fsm (
     .clk_aon_i(clk_aon_i),
@@ -271,7 +271,7 @@
     .timer_h2l_cond_met(pwrb_intr_h2l_det)
   );
 
-  rbox_keyfsm # (
+  sysrst_ctrl_keyfsm # (
     .TIMERBIT(16)
   ) i_key0intr_fsm (
     .clk_aon_i(clk_aon_i),
@@ -284,7 +284,7 @@
     .timer_h2l_cond_met(key0_intr_h2l_det)
   );
 
-  rbox_keyfsm # (
+  sysrst_ctrl_keyfsm # (
     .TIMERBIT(16)
   ) i_key1intr_fsm (
     .clk_aon_i(clk_aon_i),
@@ -297,7 +297,7 @@
     .timer_h2l_cond_met(key1_intr_h2l_det)
   );
 
-  rbox_keyfsm # (
+  sysrst_ctrl_keyfsm # (
     .TIMERBIT(16)
   ) i_key2intr_fsm (
     .clk_aon_i(clk_aon_i),
@@ -310,7 +310,7 @@
     .timer_h2l_cond_met(key2_intr_h2l_det)
   );
 
-  rbox_keyfsm # (
+  sysrst_ctrl_keyfsm # (
     .TIMERBIT(16)
   ) i_ac_presentintr_fsm (
     .clk_aon_i(clk_aon_i),
@@ -323,7 +323,7 @@
     .timer_h2l_cond_met(ac_present_intr_h2l_det)
   );
 
-  rbox_keyfsm # (
+  sysrst_ctrl_keyfsm # (
     .TIMERBIT(16)
   ) i_ec_rst_lintr_fsm (
     .clk_aon_i(clk_aon_i),
@@ -585,7 +585,7 @@
 
   assign key_intr_status_o.ec_rst_l_l2h.de = ec_rst_l_l2h_intr;
 
-  assign rbox_key_intr = pwrb_h2l_intr | pwrb_l2h_intr |
+  assign sysrst_ctrl_key_intr = pwrb_h2l_intr | pwrb_l2h_intr |
    key0_in_h2l_intr | key0_in_l2h_intr |
    key1_in_h2l_intr | key1_in_l2h_intr |
    key2_in_h2l_intr | key2_in_l2h_intr |
diff --git a/hw/ip/rbox/rtl/rbox_pin.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_pin.sv
similarity index 95%
rename from hw/ip/rbox/rtl/rbox_pin.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_pin.sv
index 1c660e6..404d147 100644
--- a/hw/ip/rbox/rtl/rbox_pin.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_pin.sv
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Description: RBOX pin visibility and override Module
+// Description: sysrst_ctrl pin visibility and override Module
 //
 
-module rbox_pin import rbox_reg_pkg::*; (
+module sysrst_ctrl_pin import sysrst_ctrl_reg_pkg::*; (
   input  clk_aon_i,
   input  rst_slow_ni,
   input  clk_i,
@@ -25,11 +25,11 @@
   input  bat_disable_hw,
   input  ec_rst_l_hw,
 
-  input  rbox_reg2hw_pin_allowed_ctl_reg_t pin_allowed_ctl_i,
-  input  rbox_reg2hw_pin_out_ctl_reg_t pin_out_ctl_i,
-  input  rbox_reg2hw_pin_out_value_reg_t pin_out_value_i,
+  input  sysrst_ctrl_reg2hw_pin_allowed_ctl_reg_t pin_allowed_ctl_i,
+  input  sysrst_ctrl_reg2hw_pin_out_ctl_reg_t pin_out_ctl_i,
+  input  sysrst_ctrl_reg2hw_pin_out_value_reg_t pin_out_value_i,
 
-  output rbox_hw2reg_pin_in_value_reg_t pin_in_value_o,
+  output sysrst_ctrl_hw2reg_pin_in_value_reg_t pin_in_value_o,
 
   output pwrb_out_int,
   output key0_out_int,
diff --git a/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_reg_pkg.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_reg_pkg.sv
new file mode 100644
index 0000000..8ad76d2
--- /dev/null
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_reg_pkg.sv
@@ -0,0 +1,493 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+//
+// Register Package auto-generated by `reggen` containing data structure
+
+package sysrst_ctrl_reg_pkg;
+
+  // Param list
+  parameter int NumCombo = 4;
+
+  // Address widths within the block
+  parameter int BlockAw = 7;
+
+  ////////////////////////////
+  // Typedefs for registers //
+  ////////////////////////////
+
+  typedef struct packed {
+    logic        q;
+  } sysrst_ctrl_reg2hw_intr_state_reg_t;
+
+  typedef struct packed {
+    logic        q;
+  } sysrst_ctrl_reg2hw_intr_enable_reg_t;
+
+  typedef struct packed {
+    logic        q;
+    logic        qe;
+  } sysrst_ctrl_reg2hw_intr_test_reg_t;
+
+  typedef struct packed {
+    logic [15:0] q;
+    logic        qe;
+  } sysrst_ctrl_reg2hw_ec_rst_ctl_reg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic        q;
+    } key0_in;
+    struct packed {
+      logic        q;
+    } key0_out;
+    struct packed {
+      logic        q;
+    } key1_in;
+    struct packed {
+      logic        q;
+    } key1_out;
+    struct packed {
+      logic        q;
+    } key2_in;
+    struct packed {
+      logic        q;
+    } key2_out;
+    struct packed {
+      logic        q;
+    } pwrb_in;
+    struct packed {
+      logic        q;
+    } pwrb_out;
+    struct packed {
+      logic        q;
+    } ac_present;
+    struct packed {
+      logic        q;
+    } bat_disable;
+  } sysrst_ctrl_reg2hw_key_invert_ctl_reg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic        q;
+    } bat_disable_0;
+    struct packed {
+      logic        q;
+    } ec_rst_l_0;
+    struct packed {
+      logic        q;
+    } pwrb_out_0;
+    struct packed {
+      logic        q;
+    } key0_out_0;
+    struct packed {
+      logic        q;
+    } key1_out_0;
+    struct packed {
+      logic        q;
+    } key2_out_0;
+    struct packed {
+      logic        q;
+    } bat_disable_1;
+    struct packed {
+      logic        q;
+    } ec_rst_l_1;
+    struct packed {
+      logic        q;
+    } pwrb_out_1;
+    struct packed {
+      logic        q;
+    } key0_out_1;
+    struct packed {
+      logic        q;
+    } key1_out_1;
+    struct packed {
+      logic        q;
+    } key2_out_1;
+  } sysrst_ctrl_reg2hw_pin_allowed_ctl_reg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic        q;
+    } bat_disable;
+    struct packed {
+      logic        q;
+    } ec_rst_l;
+    struct packed {
+      logic        q;
+    } pwrb_out;
+    struct packed {
+      logic        q;
+    } key0_out;
+    struct packed {
+      logic        q;
+    } key1_out;
+    struct packed {
+      logic        q;
+    } key2_out;
+  } sysrst_ctrl_reg2hw_pin_out_ctl_reg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic        q;
+    } bat_disable;
+    struct packed {
+      logic        q;
+    } ec_rst_l;
+    struct packed {
+      logic        q;
+    } pwrb_out;
+    struct packed {
+      logic        q;
+    } key0_out;
+    struct packed {
+      logic        q;
+    } key1_out;
+    struct packed {
+      logic        q;
+    } key2_out;
+  } sysrst_ctrl_reg2hw_pin_out_value_reg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic        q;
+    } pwrb_in_h2l;
+    struct packed {
+      logic        q;
+    } key0_in_h2l;
+    struct packed {
+      logic        q;
+    } key1_in_h2l;
+    struct packed {
+      logic        q;
+    } key2_in_h2l;
+    struct packed {
+      logic        q;
+    } ac_present_h2l;
+    struct packed {
+      logic        q;
+    } ec_rst_l_h2l;
+    struct packed {
+      logic        q;
+    } pwrb_in_l2h;
+    struct packed {
+      logic        q;
+    } key0_in_l2h;
+    struct packed {
+      logic        q;
+    } key1_in_l2h;
+    struct packed {
+      logic        q;
+    } key2_in_l2h;
+    struct packed {
+      logic        q;
+    } ac_present_l2h;
+    struct packed {
+      logic        q;
+    } ec_rst_l_l2h;
+  } sysrst_ctrl_reg2hw_key_intr_ctl_reg_t;
+
+  typedef struct packed {
+    logic [15:0] q;
+    logic        qe;
+  } sysrst_ctrl_reg2hw_key_intr_debounce_ctl_reg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic [15:0] q;
+      logic        qe;
+    } debounce_timer;
+    struct packed {
+      logic        q;
+      logic        qe;
+    } auto_block_enable;
+  } sysrst_ctrl_reg2hw_auto_block_debounce_ctl_reg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic        q;
+    } key0_out_sel;
+    struct packed {
+      logic        q;
+    } key1_out_sel;
+    struct packed {
+      logic        q;
+    } key2_out_sel;
+    struct packed {
+      logic        q;
+    } key0_out_value;
+    struct packed {
+      logic        q;
+    } key1_out_value;
+    struct packed {
+      logic        q;
+    } key2_out_value;
+  } sysrst_ctrl_reg2hw_auto_block_out_ctl_reg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic        q;
+    } key0_in_sel;
+    struct packed {
+      logic        q;
+    } key1_in_sel;
+    struct packed {
+      logic        q;
+    } key2_in_sel;
+    struct packed {
+      logic        q;
+    } pwrb_in_sel;
+    struct packed {
+      logic        q;
+    } ac_present_sel;
+  } sysrst_ctrl_reg2hw_com_sel_ctl_mreg_t;
+
+  typedef struct packed {
+    logic [31:0] q;
+    logic        qe;
+  } sysrst_ctrl_reg2hw_com_det_ctl_mreg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic        q;
+    } bat_disable;
+    struct packed {
+      logic        q;
+    } interrupt;
+    struct packed {
+      logic        q;
+    } ec_rst;
+    struct packed {
+      logic        q;
+    } gsc_rst;
+  } sysrst_ctrl_reg2hw_com_out_ctl_mreg_t;
+
+  typedef struct packed {
+    logic        d;
+    logic        de;
+  } sysrst_ctrl_hw2reg_intr_state_reg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic        d;
+      logic        de;
+    } ac_present;
+    struct packed {
+      logic        d;
+      logic        de;
+    } ec_rst_l;
+    struct packed {
+      logic        d;
+      logic        de;
+    } pwrb_in;
+    struct packed {
+      logic        d;
+      logic        de;
+    } key0_in;
+    struct packed {
+      logic        d;
+      logic        de;
+    } key1_in;
+    struct packed {
+      logic        d;
+      logic        de;
+    } key2_in;
+  } sysrst_ctrl_hw2reg_pin_in_value_reg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic        d;
+      logic        de;
+    } combo0_h2l;
+    struct packed {
+      logic        d;
+      logic        de;
+    } combo1_h2l;
+    struct packed {
+      logic        d;
+      logic        de;
+    } combo2_h2l;
+    struct packed {
+      logic        d;
+      logic        de;
+    } combo3_h2l;
+  } sysrst_ctrl_hw2reg_combo_intr_status_reg_t;
+
+  typedef struct packed {
+    struct packed {
+      logic        d;
+      logic        de;
+    } pwrb_h2l;
+    struct packed {
+      logic        d;
+      logic        de;
+    } key0_in_h2l;
+    struct packed {
+      logic        d;
+      logic        de;
+    } key1_in_h2l;
+    struct packed {
+      logic        d;
+      logic        de;
+    } key2_in_h2l;
+    struct packed {
+      logic        d;
+      logic        de;
+    } ac_present_h2l;
+    struct packed {
+      logic        d;
+      logic        de;
+    } ec_rst_l_h2l;
+    struct packed {
+      logic        d;
+      logic        de;
+    } pwrb_l2h;
+    struct packed {
+      logic        d;
+      logic        de;
+    } key0_in_l2h;
+    struct packed {
+      logic        d;
+      logic        de;
+    } key1_in_l2h;
+    struct packed {
+      logic        d;
+      logic        de;
+    } key2_in_l2h;
+    struct packed {
+      logic        d;
+      logic        de;
+    } ac_present_l2h;
+    struct packed {
+      logic        d;
+      logic        de;
+    } ec_rst_l_l2h;
+  } sysrst_ctrl_hw2reg_key_intr_status_reg_t;
+
+  // Register -> HW type
+  typedef struct packed {
+    sysrst_ctrl_reg2hw_intr_state_reg_t intr_state; // [276:276]
+    sysrst_ctrl_reg2hw_intr_enable_reg_t intr_enable; // [275:275]
+    sysrst_ctrl_reg2hw_intr_test_reg_t intr_test; // [274:273]
+    sysrst_ctrl_reg2hw_ec_rst_ctl_reg_t ec_rst_ctl; // [272:256]
+    sysrst_ctrl_reg2hw_key_invert_ctl_reg_t key_invert_ctl; // [255:246]
+    sysrst_ctrl_reg2hw_pin_allowed_ctl_reg_t pin_allowed_ctl; // [245:234]
+    sysrst_ctrl_reg2hw_pin_out_ctl_reg_t pin_out_ctl; // [233:228]
+    sysrst_ctrl_reg2hw_pin_out_value_reg_t pin_out_value; // [227:222]
+    sysrst_ctrl_reg2hw_key_intr_ctl_reg_t key_intr_ctl; // [221:210]
+    sysrst_ctrl_reg2hw_key_intr_debounce_ctl_reg_t key_intr_debounce_ctl; // [209:193]
+    sysrst_ctrl_reg2hw_auto_block_debounce_ctl_reg_t auto_block_debounce_ctl; // [192:174]
+    sysrst_ctrl_reg2hw_auto_block_out_ctl_reg_t auto_block_out_ctl; // [173:168]
+    sysrst_ctrl_reg2hw_com_sel_ctl_mreg_t [3:0] com_sel_ctl; // [167:148]
+    sysrst_ctrl_reg2hw_com_det_ctl_mreg_t [3:0] com_det_ctl; // [147:16]
+    sysrst_ctrl_reg2hw_com_out_ctl_mreg_t [3:0] com_out_ctl; // [15:0]
+  } sysrst_ctrl_reg2hw_t;
+
+  // HW -> register type
+  typedef struct packed {
+    sysrst_ctrl_hw2reg_intr_state_reg_t intr_state; // [45:44]
+    sysrst_ctrl_hw2reg_pin_in_value_reg_t pin_in_value; // [43:32]
+    sysrst_ctrl_hw2reg_combo_intr_status_reg_t combo_intr_status; // [31:24]
+    sysrst_ctrl_hw2reg_key_intr_status_reg_t key_intr_status; // [23:0]
+  } sysrst_ctrl_hw2reg_t;
+
+  // Register offsets
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_INTR_STATE_OFFSET = 7'h 0;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_INTR_ENABLE_OFFSET = 7'h 4;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_INTR_TEST_OFFSET = 7'h 8;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_REGWEN_OFFSET = 7'h c;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_EC_RST_CTL_OFFSET = 7'h 10;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_KEY_INVERT_CTL_OFFSET = 7'h 14;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_PIN_ALLOWED_CTL_OFFSET = 7'h 18;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_PIN_OUT_CTL_OFFSET = 7'h 1c;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_PIN_OUT_VALUE_OFFSET = 7'h 20;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_PIN_IN_VALUE_OFFSET = 7'h 24;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_KEY_INTR_CTL_OFFSET = 7'h 28;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_KEY_INTR_DEBOUNCE_CTL_OFFSET = 7'h 2c;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_AUTO_BLOCK_DEBOUNCE_CTL_OFFSET = 7'h 30;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_AUTO_BLOCK_OUT_CTL_OFFSET = 7'h 34;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_SEL_CTL_0_OFFSET = 7'h 38;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_SEL_CTL_1_OFFSET = 7'h 3c;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_SEL_CTL_2_OFFSET = 7'h 40;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_SEL_CTL_3_OFFSET = 7'h 44;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_DET_CTL_0_OFFSET = 7'h 48;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_DET_CTL_1_OFFSET = 7'h 4c;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_DET_CTL_2_OFFSET = 7'h 50;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_DET_CTL_3_OFFSET = 7'h 54;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_OUT_CTL_0_OFFSET = 7'h 58;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_OUT_CTL_1_OFFSET = 7'h 5c;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_OUT_CTL_2_OFFSET = 7'h 60;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COM_OUT_CTL_3_OFFSET = 7'h 64;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_COMBO_INTR_STATUS_OFFSET = 7'h 68;
+  parameter logic [BlockAw-1:0] SYSRST_CTRL_KEY_INTR_STATUS_OFFSET = 7'h 6c;
+
+  // Reset values for hwext registers and their fields
+  parameter logic [0:0] SYSRST_CTRL_INTR_TEST_RESVAL = 1'h 0;
+  parameter logic [0:0] SYSRST_CTRL_INTR_TEST_SYSRST_CTRL_COMMON_RESVAL = 1'h 0;
+
+  // Register index
+  typedef enum int {
+    SYSRST_CTRL_INTR_STATE,
+    SYSRST_CTRL_INTR_ENABLE,
+    SYSRST_CTRL_INTR_TEST,
+    SYSRST_CTRL_REGWEN,
+    SYSRST_CTRL_EC_RST_CTL,
+    SYSRST_CTRL_KEY_INVERT_CTL,
+    SYSRST_CTRL_PIN_ALLOWED_CTL,
+    SYSRST_CTRL_PIN_OUT_CTL,
+    SYSRST_CTRL_PIN_OUT_VALUE,
+    SYSRST_CTRL_PIN_IN_VALUE,
+    SYSRST_CTRL_KEY_INTR_CTL,
+    SYSRST_CTRL_KEY_INTR_DEBOUNCE_CTL,
+    SYSRST_CTRL_AUTO_BLOCK_DEBOUNCE_CTL,
+    SYSRST_CTRL_AUTO_BLOCK_OUT_CTL,
+    SYSRST_CTRL_COM_SEL_CTL_0,
+    SYSRST_CTRL_COM_SEL_CTL_1,
+    SYSRST_CTRL_COM_SEL_CTL_2,
+    SYSRST_CTRL_COM_SEL_CTL_3,
+    SYSRST_CTRL_COM_DET_CTL_0,
+    SYSRST_CTRL_COM_DET_CTL_1,
+    SYSRST_CTRL_COM_DET_CTL_2,
+    SYSRST_CTRL_COM_DET_CTL_3,
+    SYSRST_CTRL_COM_OUT_CTL_0,
+    SYSRST_CTRL_COM_OUT_CTL_1,
+    SYSRST_CTRL_COM_OUT_CTL_2,
+    SYSRST_CTRL_COM_OUT_CTL_3,
+    SYSRST_CTRL_COMBO_INTR_STATUS,
+    SYSRST_CTRL_KEY_INTR_STATUS
+  } sysrst_ctrl_id_e;
+
+  // Register width information to check illegal writes
+  parameter logic [3:0] SYSRST_CTRL_PERMIT [28] = '{
+    4'b 0001, // index[ 0] SYSRST_CTRL_INTR_STATE
+    4'b 0001, // index[ 1] SYSRST_CTRL_INTR_ENABLE
+    4'b 0001, // index[ 2] SYSRST_CTRL_INTR_TEST
+    4'b 0001, // index[ 3] SYSRST_CTRL_REGWEN
+    4'b 0011, // index[ 4] SYSRST_CTRL_EC_RST_CTL
+    4'b 0011, // index[ 5] SYSRST_CTRL_KEY_INVERT_CTL
+    4'b 0011, // index[ 6] SYSRST_CTRL_PIN_ALLOWED_CTL
+    4'b 0001, // index[ 7] SYSRST_CTRL_PIN_OUT_CTL
+    4'b 0001, // index[ 8] SYSRST_CTRL_PIN_OUT_VALUE
+    4'b 0001, // index[ 9] SYSRST_CTRL_PIN_IN_VALUE
+    4'b 0011, // index[10] SYSRST_CTRL_KEY_INTR_CTL
+    4'b 0011, // index[11] SYSRST_CTRL_KEY_INTR_DEBOUNCE_CTL
+    4'b 0111, // index[12] SYSRST_CTRL_AUTO_BLOCK_DEBOUNCE_CTL
+    4'b 0001, // index[13] SYSRST_CTRL_AUTO_BLOCK_OUT_CTL
+    4'b 0001, // index[14] SYSRST_CTRL_COM_SEL_CTL_0
+    4'b 0001, // index[15] SYSRST_CTRL_COM_SEL_CTL_1
+    4'b 0001, // index[16] SYSRST_CTRL_COM_SEL_CTL_2
+    4'b 0001, // index[17] SYSRST_CTRL_COM_SEL_CTL_3
+    4'b 1111, // index[18] SYSRST_CTRL_COM_DET_CTL_0
+    4'b 1111, // index[19] SYSRST_CTRL_COM_DET_CTL_1
+    4'b 1111, // index[20] SYSRST_CTRL_COM_DET_CTL_2
+    4'b 1111, // index[21] SYSRST_CTRL_COM_DET_CTL_3
+    4'b 0001, // index[22] SYSRST_CTRL_COM_OUT_CTL_0
+    4'b 0001, // index[23] SYSRST_CTRL_COM_OUT_CTL_1
+    4'b 0001, // index[24] SYSRST_CTRL_COM_OUT_CTL_2
+    4'b 0001, // index[25] SYSRST_CTRL_COM_OUT_CTL_3
+    4'b 0001, // index[26] SYSRST_CTRL_COMBO_INTR_STATUS
+    4'b 0011  // index[27] SYSRST_CTRL_KEY_INTR_STATUS
+  };
+
+endpackage
+
diff --git a/hw/ip/rbox/rtl/rbox_reg_top.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_reg_top.sv
similarity index 94%
rename from hw/ip/rbox/rtl/rbox_reg_top.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_reg_top.sv
index 5f649bd..dee9426 100644
--- a/hw/ip/rbox/rtl/rbox_reg_top.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_reg_top.sv
@@ -6,15 +6,15 @@
 
 `include "prim_assert.sv"
 
-module rbox_reg_top (
+module sysrst_ctrl_reg_top (
   input clk_i,
   input rst_ni,
 
   input  tlul_pkg::tl_h2d_t tl_i,
   output tlul_pkg::tl_d2h_t tl_o,
   // To HW
-  output rbox_reg_pkg::rbox_reg2hw_t reg2hw, // Write
-  input  rbox_reg_pkg::rbox_hw2reg_t hw2reg, // Read
+  output sysrst_ctrl_reg_pkg::sysrst_ctrl_reg2hw_t reg2hw, // Write
+  input  sysrst_ctrl_reg_pkg::sysrst_ctrl_hw2reg_t hw2reg, // Read
 
   // Integrity check errors
   output logic intg_err_o,
@@ -23,7 +23,7 @@
   input devmode_i // If 1, explicit error return for unmapped register access
 );
 
-  import rbox_reg_pkg::* ;
+  import sysrst_ctrl_reg_pkg::* ;
 
   localparam int AW = 7;
   localparam int DW = 32;
@@ -3675,34 +3675,34 @@
   logic [27:0] addr_hit;
   always_comb begin
     addr_hit = '0;
-    addr_hit[ 0] = (reg_addr == RBOX_INTR_STATE_OFFSET);
-    addr_hit[ 1] = (reg_addr == RBOX_INTR_ENABLE_OFFSET);
-    addr_hit[ 2] = (reg_addr == RBOX_INTR_TEST_OFFSET);
-    addr_hit[ 3] = (reg_addr == RBOX_REGWEN_OFFSET);
-    addr_hit[ 4] = (reg_addr == RBOX_EC_RST_CTL_OFFSET);
-    addr_hit[ 5] = (reg_addr == RBOX_KEY_INVERT_CTL_OFFSET);
-    addr_hit[ 6] = (reg_addr == RBOX_PIN_ALLOWED_CTL_OFFSET);
-    addr_hit[ 7] = (reg_addr == RBOX_PIN_OUT_CTL_OFFSET);
-    addr_hit[ 8] = (reg_addr == RBOX_PIN_OUT_VALUE_OFFSET);
-    addr_hit[ 9] = (reg_addr == RBOX_PIN_IN_VALUE_OFFSET);
-    addr_hit[10] = (reg_addr == RBOX_KEY_INTR_CTL_OFFSET);
-    addr_hit[11] = (reg_addr == RBOX_KEY_INTR_DEBOUNCE_CTL_OFFSET);
-    addr_hit[12] = (reg_addr == RBOX_AUTO_BLOCK_DEBOUNCE_CTL_OFFSET);
-    addr_hit[13] = (reg_addr == RBOX_AUTO_BLOCK_OUT_CTL_OFFSET);
-    addr_hit[14] = (reg_addr == RBOX_COM_SEL_CTL_0_OFFSET);
-    addr_hit[15] = (reg_addr == RBOX_COM_SEL_CTL_1_OFFSET);
-    addr_hit[16] = (reg_addr == RBOX_COM_SEL_CTL_2_OFFSET);
-    addr_hit[17] = (reg_addr == RBOX_COM_SEL_CTL_3_OFFSET);
-    addr_hit[18] = (reg_addr == RBOX_COM_DET_CTL_0_OFFSET);
-    addr_hit[19] = (reg_addr == RBOX_COM_DET_CTL_1_OFFSET);
-    addr_hit[20] = (reg_addr == RBOX_COM_DET_CTL_2_OFFSET);
-    addr_hit[21] = (reg_addr == RBOX_COM_DET_CTL_3_OFFSET);
-    addr_hit[22] = (reg_addr == RBOX_COM_OUT_CTL_0_OFFSET);
-    addr_hit[23] = (reg_addr == RBOX_COM_OUT_CTL_1_OFFSET);
-    addr_hit[24] = (reg_addr == RBOX_COM_OUT_CTL_2_OFFSET);
-    addr_hit[25] = (reg_addr == RBOX_COM_OUT_CTL_3_OFFSET);
-    addr_hit[26] = (reg_addr == RBOX_COMBO_INTR_STATUS_OFFSET);
-    addr_hit[27] = (reg_addr == RBOX_KEY_INTR_STATUS_OFFSET);
+    addr_hit[ 0] = (reg_addr == SYSRST_CTRL_INTR_STATE_OFFSET);
+    addr_hit[ 1] = (reg_addr == SYSRST_CTRL_INTR_ENABLE_OFFSET);
+    addr_hit[ 2] = (reg_addr == SYSRST_CTRL_INTR_TEST_OFFSET);
+    addr_hit[ 3] = (reg_addr == SYSRST_CTRL_REGWEN_OFFSET);
+    addr_hit[ 4] = (reg_addr == SYSRST_CTRL_EC_RST_CTL_OFFSET);
+    addr_hit[ 5] = (reg_addr == SYSRST_CTRL_KEY_INVERT_CTL_OFFSET);
+    addr_hit[ 6] = (reg_addr == SYSRST_CTRL_PIN_ALLOWED_CTL_OFFSET);
+    addr_hit[ 7] = (reg_addr == SYSRST_CTRL_PIN_OUT_CTL_OFFSET);
+    addr_hit[ 8] = (reg_addr == SYSRST_CTRL_PIN_OUT_VALUE_OFFSET);
+    addr_hit[ 9] = (reg_addr == SYSRST_CTRL_PIN_IN_VALUE_OFFSET);
+    addr_hit[10] = (reg_addr == SYSRST_CTRL_KEY_INTR_CTL_OFFSET);
+    addr_hit[11] = (reg_addr == SYSRST_CTRL_KEY_INTR_DEBOUNCE_CTL_OFFSET);
+    addr_hit[12] = (reg_addr == SYSRST_CTRL_AUTO_BLOCK_DEBOUNCE_CTL_OFFSET);
+    addr_hit[13] = (reg_addr == SYSRST_CTRL_AUTO_BLOCK_OUT_CTL_OFFSET);
+    addr_hit[14] = (reg_addr == SYSRST_CTRL_COM_SEL_CTL_0_OFFSET);
+    addr_hit[15] = (reg_addr == SYSRST_CTRL_COM_SEL_CTL_1_OFFSET);
+    addr_hit[16] = (reg_addr == SYSRST_CTRL_COM_SEL_CTL_2_OFFSET);
+    addr_hit[17] = (reg_addr == SYSRST_CTRL_COM_SEL_CTL_3_OFFSET);
+    addr_hit[18] = (reg_addr == SYSRST_CTRL_COM_DET_CTL_0_OFFSET);
+    addr_hit[19] = (reg_addr == SYSRST_CTRL_COM_DET_CTL_1_OFFSET);
+    addr_hit[20] = (reg_addr == SYSRST_CTRL_COM_DET_CTL_2_OFFSET);
+    addr_hit[21] = (reg_addr == SYSRST_CTRL_COM_DET_CTL_3_OFFSET);
+    addr_hit[22] = (reg_addr == SYSRST_CTRL_COM_OUT_CTL_0_OFFSET);
+    addr_hit[23] = (reg_addr == SYSRST_CTRL_COM_OUT_CTL_1_OFFSET);
+    addr_hit[24] = (reg_addr == SYSRST_CTRL_COM_OUT_CTL_2_OFFSET);
+    addr_hit[25] = (reg_addr == SYSRST_CTRL_COM_OUT_CTL_3_OFFSET);
+    addr_hit[26] = (reg_addr == SYSRST_CTRL_COMBO_INTR_STATUS_OFFSET);
+    addr_hit[27] = (reg_addr == SYSRST_CTRL_KEY_INTR_STATUS_OFFSET);
   end
 
   assign addrmiss = (reg_re || reg_we) ? ~|addr_hit : 1'b0 ;
@@ -3710,34 +3710,34 @@
   // Check sub-word write is permitted
   always_comb begin
     wr_err = 1'b0;
-    if (addr_hit[ 0] && reg_we && (RBOX_PERMIT[ 0] != (RBOX_PERMIT[ 0] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[ 1] && reg_we && (RBOX_PERMIT[ 1] != (RBOX_PERMIT[ 1] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[ 2] && reg_we && (RBOX_PERMIT[ 2] != (RBOX_PERMIT[ 2] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[ 3] && reg_we && (RBOX_PERMIT[ 3] != (RBOX_PERMIT[ 3] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[ 4] && reg_we && (RBOX_PERMIT[ 4] != (RBOX_PERMIT[ 4] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[ 5] && reg_we && (RBOX_PERMIT[ 5] != (RBOX_PERMIT[ 5] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[ 6] && reg_we && (RBOX_PERMIT[ 6] != (RBOX_PERMIT[ 6] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[ 7] && reg_we && (RBOX_PERMIT[ 7] != (RBOX_PERMIT[ 7] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[ 8] && reg_we && (RBOX_PERMIT[ 8] != (RBOX_PERMIT[ 8] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[ 9] && reg_we && (RBOX_PERMIT[ 9] != (RBOX_PERMIT[ 9] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[10] && reg_we && (RBOX_PERMIT[10] != (RBOX_PERMIT[10] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[11] && reg_we && (RBOX_PERMIT[11] != (RBOX_PERMIT[11] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[12] && reg_we && (RBOX_PERMIT[12] != (RBOX_PERMIT[12] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[13] && reg_we && (RBOX_PERMIT[13] != (RBOX_PERMIT[13] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[14] && reg_we && (RBOX_PERMIT[14] != (RBOX_PERMIT[14] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[15] && reg_we && (RBOX_PERMIT[15] != (RBOX_PERMIT[15] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[16] && reg_we && (RBOX_PERMIT[16] != (RBOX_PERMIT[16] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[17] && reg_we && (RBOX_PERMIT[17] != (RBOX_PERMIT[17] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[18] && reg_we && (RBOX_PERMIT[18] != (RBOX_PERMIT[18] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[19] && reg_we && (RBOX_PERMIT[19] != (RBOX_PERMIT[19] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[20] && reg_we && (RBOX_PERMIT[20] != (RBOX_PERMIT[20] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[21] && reg_we && (RBOX_PERMIT[21] != (RBOX_PERMIT[21] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[22] && reg_we && (RBOX_PERMIT[22] != (RBOX_PERMIT[22] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[23] && reg_we && (RBOX_PERMIT[23] != (RBOX_PERMIT[23] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[24] && reg_we && (RBOX_PERMIT[24] != (RBOX_PERMIT[24] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[25] && reg_we && (RBOX_PERMIT[25] != (RBOX_PERMIT[25] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[26] && reg_we && (RBOX_PERMIT[26] != (RBOX_PERMIT[26] & reg_be))) wr_err = 1'b1 ;
-    if (addr_hit[27] && reg_we && (RBOX_PERMIT[27] != (RBOX_PERMIT[27] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[ 0] && reg_we && (SYSRST_CTRL_PERMIT[ 0] != (SYSRST_CTRL_PERMIT[ 0] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[ 1] && reg_we && (SYSRST_CTRL_PERMIT[ 1] != (SYSRST_CTRL_PERMIT[ 1] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[ 2] && reg_we && (SYSRST_CTRL_PERMIT[ 2] != (SYSRST_CTRL_PERMIT[ 2] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[ 3] && reg_we && (SYSRST_CTRL_PERMIT[ 3] != (SYSRST_CTRL_PERMIT[ 3] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[ 4] && reg_we && (SYSRST_CTRL_PERMIT[ 4] != (SYSRST_CTRL_PERMIT[ 4] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[ 5] && reg_we && (SYSRST_CTRL_PERMIT[ 5] != (SYSRST_CTRL_PERMIT[ 5] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[ 6] && reg_we && (SYSRST_CTRL_PERMIT[ 6] != (SYSRST_CTRL_PERMIT[ 6] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[ 7] && reg_we && (SYSRST_CTRL_PERMIT[ 7] != (SYSRST_CTRL_PERMIT[ 7] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[ 8] && reg_we && (SYSRST_CTRL_PERMIT[ 8] != (SYSRST_CTRL_PERMIT[ 8] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[ 9] && reg_we && (SYSRST_CTRL_PERMIT[ 9] != (SYSRST_CTRL_PERMIT[ 9] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[10] && reg_we && (SYSRST_CTRL_PERMIT[10] != (SYSRST_CTRL_PERMIT[10] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[11] && reg_we && (SYSRST_CTRL_PERMIT[11] != (SYSRST_CTRL_PERMIT[11] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[12] && reg_we && (SYSRST_CTRL_PERMIT[12] != (SYSRST_CTRL_PERMIT[12] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[13] && reg_we && (SYSRST_CTRL_PERMIT[13] != (SYSRST_CTRL_PERMIT[13] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[14] && reg_we && (SYSRST_CTRL_PERMIT[14] != (SYSRST_CTRL_PERMIT[14] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[15] && reg_we && (SYSRST_CTRL_PERMIT[15] != (SYSRST_CTRL_PERMIT[15] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[16] && reg_we && (SYSRST_CTRL_PERMIT[16] != (SYSRST_CTRL_PERMIT[16] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[17] && reg_we && (SYSRST_CTRL_PERMIT[17] != (SYSRST_CTRL_PERMIT[17] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[18] && reg_we && (SYSRST_CTRL_PERMIT[18] != (SYSRST_CTRL_PERMIT[18] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[19] && reg_we && (SYSRST_CTRL_PERMIT[19] != (SYSRST_CTRL_PERMIT[19] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[20] && reg_we && (SYSRST_CTRL_PERMIT[20] != (SYSRST_CTRL_PERMIT[20] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[21] && reg_we && (SYSRST_CTRL_PERMIT[21] != (SYSRST_CTRL_PERMIT[21] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[22] && reg_we && (SYSRST_CTRL_PERMIT[22] != (SYSRST_CTRL_PERMIT[22] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[23] && reg_we && (SYSRST_CTRL_PERMIT[23] != (SYSRST_CTRL_PERMIT[23] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[24] && reg_we && (SYSRST_CTRL_PERMIT[24] != (SYSRST_CTRL_PERMIT[24] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[25] && reg_we && (SYSRST_CTRL_PERMIT[25] != (SYSRST_CTRL_PERMIT[25] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[26] && reg_we && (SYSRST_CTRL_PERMIT[26] != (SYSRST_CTRL_PERMIT[26] & reg_be))) wr_err = 1'b1 ;
+    if (addr_hit[27] && reg_we && (SYSRST_CTRL_PERMIT[27] != (SYSRST_CTRL_PERMIT[27] & reg_be))) wr_err = 1'b1 ;
   end
 
   assign intr_state_we = addr_hit[0] & reg_we & !reg_error;
diff --git a/hw/ip/rbox/rtl/rbox_timerfsm.sv b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_timerfsm.sv
similarity index 97%
rename from hw/ip/rbox/rtl/rbox_timerfsm.sv
rename to hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_timerfsm.sv
index 91ebf53..ae00dc3 100644
--- a/hw/ip/rbox/rtl/rbox_timerfsm.sv
+++ b/hw/ip/sysrst_ctrl/rtl/sysrst_ctrl_timerfsm.sv
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Description RBOX timer-based FSM module
+// Description sysrst_ctrl timer-based FSM module
 
-module rbox_timerfsm #(
+module sysrst_ctrl_timerfsm #(
   parameter int unsigned TIMERBIT = 16
   ) (
   input                clk_aon_i,
diff --git a/hw/ip/rbox/rbox.core b/hw/ip/sysrst_ctrl/sysrst_ctrl.core
similarity index 62%
rename from hw/ip/rbox/rbox.core
rename to hw/ip/sysrst_ctrl/sysrst_ctrl.core
index 5efb614..aa468a1 100644
--- a/hw/ip/rbox/rbox.core
+++ b/hw/ip/sysrst_ctrl/sysrst_ctrl.core
@@ -2,8 +2,8 @@
 # Copyright lowRISC contributors.
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:ip:rbox:1.0"
-description: "rbox"
+name: "lowrisc:ip:sysrst_ctrl:1.0"
+description: "sysrst_ctrl"
 filesets:
   files_rtl:
     depend:
@@ -11,20 +11,20 @@
       - lowrisc:prim:all
       - lowrisc:ip:tlul
     files:
-      - rtl/rbox_reg_pkg.sv
-      - rtl/rbox_reg_top.sv
-      - rtl/rbox_autoblock.sv
-      - rtl/rbox_comboact.sv
-      - rtl/rbox_combotrg.sv
-      - rtl/rbox_intr.sv
-      - rtl/rbox_inv.sv
-      - rtl/rbox_pin.sv
-      - rtl/rbox_keyintr.sv
-      - rtl/rbox_timerfsm.sv
-      - rtl/rbox_keyfsm.sv
-      - rtl/rbox_combofsm.sv
-      - rtl/rbox_combo.sv
-      - rtl/rbox.sv
+      - rtl/sysrst_ctrl_reg_pkg.sv
+      - rtl/sysrst_ctrl_reg_top.sv
+      - rtl/sysrst_ctrl_autoblock.sv
+      - rtl/sysrst_ctrl_comboact.sv
+      - rtl/sysrst_ctrl_combotrg.sv
+      - rtl/sysrst_ctrl_intr.sv
+      - rtl/sysrst_ctrl_inv.sv
+      - rtl/sysrst_ctrl_pin.sv
+      - rtl/sysrst_ctrl_keyintr.sv
+      - rtl/sysrst_ctrl_timerfsm.sv
+      - rtl/sysrst_ctrl_keyfsm.sv
+      - rtl/sysrst_ctrl_combofsm.sv
+      - rtl/sysrst_ctrl_combo.sv
+      - rtl/sysrst_ctrl.sv
     file_type: systemVerilogSource
 
   files_ascentlint_waiver:
@@ -49,7 +49,7 @@
     filesets:
       - tool_ascentlint  ? (files_ascentlint_waiver)
       - files_rtl
-    toplevel: rbox
+    toplevel: sysrst_ctrl
 
 
   lint:
diff --git a/hw/top_earlgrey/lint/top_earlgrey_lint_cfgs.hjson b/hw/top_earlgrey/lint/top_earlgrey_lint_cfgs.hjson
index 019c380..e911b8e 100644
--- a/hw/top_earlgrey/lint/top_earlgrey_lint_cfgs.hjson
+++ b/hw/top_earlgrey/lint/top_earlgrey_lint_cfgs.hjson
@@ -142,10 +142,10 @@
                     }
                   ]
              },
-             {    name: rbox
-                  fusesoc_core: lowrisc:ip:rbox
+             {    name: sysrst_ctrl
+                  fusesoc_core: lowrisc:ip:sysrst_ctrl
                   import_cfgs: ["{proj_root}/hw/lint/tools/dvsim/common_lint_cfg.hjson"]
-                  rel_path: "hw/ip/rbox/lint/{tool}"
+                  rel_path: "hw/ip/sysrst_ctrl/lint/{tool}"
              },
              {    name: rstmgr
                   fusesoc_core: lowrisc:ip:rstmgr