From 94acba86fa05a5994d8d81da89dee063ab6d34d8 Mon Sep 17 00:00:00 2001
From: Raul E Rangel <rrangel@chromium.org>
Date: Thu, 7 May 2020 15:12:20 -0600
Subject: soc/amd/picasso: Move acpi_fill_mcfg

Move this with the other acpi functions.

BUG=b:147042464
TEST=build trembyle

Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Change-Id: I24bd5c7d7c90968759ac745012e7bbc47f0ef6a8
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41262
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/soc/amd/picasso/acpi.c        | 13 ++++++++++++-
 src/soc/amd/picasso/northbridge.c | 12 ------------
 2 files changed, 12 insertions(+), 13 deletions(-)

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;
-- 
cgit v1.2.3