3 files changed, 36 insertions, 7 deletions
diff --git a/src/soc/amd/common/psp_verstage/fch.c b/src/soc/amd/common/psp_verstage/fch.c
index f578bcb339..fca4c9a0af 100644
--- a/src/soc/amd/common/psp_verstage/fch.c
+++ b/src/soc/amd/common/psp_verstage/fch.c
@@ -152,15 +152,29 @@ uint32_t verstage_soc_early_init(void)
 	return map_fch_devices();
 }
 
-void verstage_soc_init(void)
+void verstage_soc_espi_init(void)
 {
-	if (CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI))
-		espi_setup();
+	if (!CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI))
+		return;
+	printk(BIOS_DEBUG, "Setting up espi\n");
+	espi_setup();
+}
 
-	enable_aoac_devices();
+void verstage_soc_i2c_init(void)
+{
 	printk(BIOS_DEBUG, "Setting up i2c\n");
 	i2c_soc_early_init();
-	printk(BIOS_DEBUG, "i2c setup\n");
+}
+
+void verstage_soc_aoac_init(void)
+{
+	printk(BIOS_DEBUG, "Setting up aoac\n");
+	enable_aoac_devices();
+}
+
+void verstage_soc_spi_init(void)
+{
+	printk(BIOS_DEBUG, "Setting up spi\n");
 	fch_spi_config_modes();
 	show_spi_speeds_and_modes();
 }
diff --git a/src/soc/amd/common/psp_verstage/include/psp_verstage.h b/src/soc/amd/common/psp_verstage/include/psp_verstage.h
index 976bc6942a..dbdf2f2884 100644
--- a/src/soc/amd/common/psp_verstage/include/psp_verstage.h
+++ b/src/soc/amd/common/psp_verstage/include/psp_verstage.h
@@ -49,7 +49,10 @@ void test_svc_calls(void);
 uint32_t unmap_fch_devices(void);
 uint32_t verstage_soc_early_init(void);
 void verstage_mainboard_espi_init(void);
-void verstage_soc_init(void);
+void verstage_soc_aoac_init(void);
+void verstage_soc_espi_init(void);
+void verstage_soc_i2c_init(void);
+void verstage_soc_spi_init(void);
 uintptr_t *map_spi_rom(void);
 
 uint32_t get_max_workbuf_size(uint32_t *size);
diff --git a/src/soc/amd/common/psp_verstage/psp_verstage.c b/src/soc/amd/common/psp_verstage/psp_verstage.c
index f3b42565b3..8fc2732d47 100644
--- a/src/soc/amd/common/psp_verstage/psp_verstage.c
+++ b/src/soc/amd/common/psp_verstage/psp_verstage.c
@@ -243,7 +243,19 @@ void Main(void)
 
 	svc_write_postcode(POSTCODE_LATE_INIT);
 	fch_io_enable_legacy_io();
-	verstage_soc_init();
+
+	printk(BIOS_DEBUG, "calling verstage_soc_espi_init\n");
+	verstage_soc_espi_init();
+
+	printk(BIOS_DEBUG, "calling verstage_soc_aoac_init\n");
+	verstage_soc_aoac_init();
+
+	printk(BIOS_DEBUG, "calling verstage_soc_i2c_init\n");
+	verstage_soc_i2c_init();
+
+	printk(BIOS_DEBUG, "calling verstage_soc_spi_init\n");
+	verstage_soc_spi_init();
+
 	verstage_mainboard_init();
 
 	post_code(POSTCODE_VERSTAGE_MAIN);