diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 1f7fba03aaac..bb91d2de702b 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -805,6 +805,7 @@ static int __init scmi_driver_init(void)
 	scmi_clock_register();
 	scmi_perf_register();
 	scmi_power_register();
+	scmi_reset_register();
 	scmi_sensors_register();
 
 	return platform_driver_register(&scmi_driver);
@@ -818,6 +819,7 @@ static void __exit scmi_driver_exit(void)
 	scmi_clock_unregister();
 	scmi_perf_unregister();
 	scmi_power_unregister();
+	scmi_reset_unregister();
 	scmi_sensors_unregister();
 
 	platform_driver_unregister(&scmi_driver);
diff --git a/drivers/firmware/arm_scmi/reset.c b/drivers/firmware/arm_scmi/reset.c
index f3c25e847b2b..fea07363b2c4 100644
--- a/drivers/firmware/arm_scmi/reset.c
+++ b/drivers/firmware/arm_scmi/reset.c
@@ -223,9 +223,4 @@ static int scmi_reset_protocol_init(struct scmi_handle *handle)
 	return 0;
 }
 
-static int __init scmi_reset_init(void)
-{
-	return scmi_protocol_register(SCMI_PROTOCOL_RESET,
-				      &scmi_reset_protocol_init);
-}
-subsys_initcall(scmi_reset_init);
+DEFINE_SCMI_PROTOCOL_REGISTER_UNREGISTER(SCMI_PROTOCOL_RESET, reset)