diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index a02d8f37cb..ac23d0f1e9 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -20,11 +20,22 @@
 #include <soc/pci_devs.h>
 #include <soc/cpu.h>
 #include <soc/southbridge.h>
-#include <soc/northbridge.h>
 #include <soc/nvs.h>
 #include <soc/gpio.h>
 #include <version.h>
 
+unsigned long acpi_fill_mcfg(unsigned long current)
+{
+
+	current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
+					     CONFIG_MMCONF_BASE_ADDRESS,
+					     0,
+					     0,
+					     CONFIG_MMCONF_BUS_NUMBER);
+
+	return current;
+}
+
 unsigned long acpi_fill_madt(unsigned long current)
 {
 	/* create all subtables for processors */
diff --git a/src/soc/amd/picasso/northbridge.c b/src/soc/amd/picasso/northbridge.c
index dbd6a73566..70ad8d102a 100644
--- a/src/soc/amd/picasso/northbridge.c
+++ b/src/soc/amd/picasso/northbridge.c
@@ -146,18 +146,6 @@ static void set_resources(struct device *dev)
 			assign_resources(bus);
 }
 
-unsigned long acpi_fill_mcfg(unsigned long current)
-{
-
-	current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
-					     CONFIG_MMCONF_BASE_ADDRESS,
-					     0,
-					     0,
-					     CONFIG_MMCONF_BUS_NUMBER);
-
-	return current;
-}
-
 static void northbridge_fill_ssdt_generator(const struct device *device)
 {
 	msr_t msr;