diff --git a/src/mainboard/google/rauru/mainboard.c b/src/mainboard/google/rauru/mainboard.c
index d0ed3ad7f7..93489426b8 100644
--- a/src/mainboard/google/rauru/mainboard.c
+++ b/src/mainboard/google/rauru/mainboard.c
@@ -7,13 +7,11 @@
 #include <soc/addressmap.h>
 #include <soc/bl31.h>
 #include <soc/display.h>
-#include <soc/dpm_v2.h>
 #include <soc/gpio_common.h>
 #include <soc/i2c.h>
 #include <soc/msdc.h>
 #include <soc/mt6373.h>
 #include <soc/pcie.h>
-#include <soc/spm_common.h>
 #include <soc/storage.h>
 #include <soc/usb.h>
 #include <variants.h>
@@ -128,12 +126,6 @@ static void mainboard_init(struct device *dev)
 	if (CONFIG(RAURU_SDCARD_INIT))
 		mtk_msdc_configure_sdcard();
 
-	if (dpm_init())
-		printk(BIOS_ERR, "dpm init failed, DVFS may not work\n");
-
-	if (spm_init())
-		printk(BIOS_ERR, "spm init failed, Suspend may not work\n");
-
 	if (CONFIG(ARM64_USE_ARM_TRUSTED_FIRMWARE))
 		register_reset_to_bl31(GPIO_AP_EC_WARM_RST_REQ.id, true);
 }
diff --git a/src/soc/mediatek/mt8196/soc.c b/src/soc/mediatek/mt8196/soc.c
index bacbe0c2c5..24077a0fbc 100644
--- a/src/soc/mediatek/mt8196/soc.c
+++ b/src/soc/mediatek/mt8196/soc.c
@@ -5,6 +5,7 @@
 #include <device/pci.h>
 #include <soc/booker.h>
 #include <soc/dcc.h>
+#include <soc/dpm_v2.h>
 #include <soc/dramc_info.h>
 #include <soc/emi.h>
 #include <soc/gpueb.h>
@@ -14,6 +15,7 @@
 #include <soc/mtk_fsp.h>
 #include <soc/pcie.h>
 #include <soc/pi_image.h>
+#include <soc/spm.h>
 #include <soc/sspm.h>
 #include <soc/storage.h>
 #include <soc/symbols.h>
@@ -54,7 +56,7 @@ static void mte_setup(void)
 	booker_mte_init(mte_start);
 }
 
-static void soc_init(struct device *dev)
+static void fsp_init(void)
 {
 	uint32_t storage_type = mainboard_get_storage_type();
 
@@ -63,8 +65,18 @@ static void soc_init(struct device *dev)
 	mtk_fsp_add_param(FSP_PARAM_TYPE_STORAGE, sizeof(storage_type), &storage_type);
 	pi_image_add_mtk_fsp_params();
 	mtk_fsp_load_and_run();
+}
 
+static void soc_init(struct device *dev)
+{
 	mtk_mmu_disable_l2c_sram();
+
+	if (dpm_init())
+		printk(BIOS_ERR, "dpm init failed, DVFS may not work\n");
+	if (spm_init())
+		printk(BIOS_ERR, "spm init failed, Suspend may not work\n");
+
+	fsp_init();
 	sspm_init();
 	gpueb_init();
 	mcupm_init();