diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c
index 5bf347b45c..1c8671c01e 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -35,8 +35,6 @@ static const char *soc_acpi_name(const struct device *dev)
 
 	if (dev->bus->dev->path.type == DEVICE_PATH_DOMAIN) {
 		switch (dev->path.pci.devfn) {
-		case GNB_DEVFN:
-			return "GNB";
 		case IOMMU_DEVFN:
 			return "IOMM";
 		default:
diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c
index 6e98698e43..ee9764cb7d 100644
--- a/src/soc/amd/picasso/root_complex.c
+++ b/src/soc/amd/picasso/root_complex.c
@@ -269,11 +269,17 @@ static void root_complex_fill_ssdt(const struct device *device)
 	acipgen_dptci();
 }
 
+static const char *gnb_acpi_name(const struct device *dev)
+{
+	return "GNB";
+}
+
 static struct device_operations root_complex_operations = {
 	.read_resources		= read_resources,
 	.set_resources		= noop_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= root_complex_init,
+	.acpi_name		= gnb_acpi_name,
 	.acpi_fill_ssdt		= root_complex_fill_ssdt,
 };