2 files changed, 15 insertions, 8 deletions
diff --git a/src/soc/amd/mendocino/acpi.c b/src/soc/amd/mendocino/acpi.c
index 11261db91a..328a2f9b4d 100644
--- a/src/soc/amd/mendocino/acpi.c
+++ b/src/soc/amd/mendocino/acpi.c
@@ -15,6 +15,7 @@
 #include <arch/smp/mpspec.h>
 #include <console/console.h>
 #include <cpu/amd/cpuid.h>
+#include <device/device.h>
 #include <soc/iomap.h>
 #include <types.h>
 #include "chip.h"
@@ -56,6 +57,19 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
 	fadt->flags |= cfg->common_config.fadt_flags; /* additional board-specific flags */
 }
 
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    acpi_rsdp_t *rsdp)
+{
+	/* TODO: look into adding CRAT */
+
+	/* IVRS */
+	current = acpi_add_ivrs_table(current, rsdp);
+
+	current = acpi_add_fsp_tables(current, rsdp);
+
+	return current;
+}
+
 const acpi_cstate_t cstate_cfg_table[] = {
 	[0] = {
 		.ctype = 1,
diff --git a/src/soc/amd/mendocino/agesa_acpi.c b/src/soc/amd/mendocino/agesa_acpi.c
index 7ff8403a9d..da0f9a1e1a 100644
--- a/src/soc/amd/mendocino/agesa_acpi.c
+++ b/src/soc/amd/mendocino/agesa_acpi.c
@@ -4,21 +4,14 @@
 
 #include <acpi/acpi.h>
 #include <amdblocks/acpi.h>
-#include <device/device.h>
 #include <FspGuids.h>
 #include <types.h>
 
-unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
-				    acpi_rsdp_t *rsdp)
+unsigned long acpi_add_fsp_tables(unsigned long current, acpi_rsdp_t *rsdp)
 {
-	/* TODO: look into adding CRAT */
-
 	/* add ALIB SSDT from HOB */
 	current = acpi_align_current(current);
 	current = add_agesa_fsp_acpi_table(AMD_FSP_ACPI_ALIB_HOB_GUID, "ALIB", rsdp, current);
 
-	/* IVRS */
-	current = acpi_add_ivrs_table(current, rsdp);
-
 	return current;
 }