From 3e29ca93fc98a3481a313c24d7b1c50b52c0ab4e Mon Sep 17 00:00:00 2001
From: Felix Held <felix-coreboot@felixheld.de>
Date: Tue, 16 Feb 2021 23:52:58 +0100
Subject: [PATCH] soc/amd/common/block/lpc: move ACPI name to common code

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I7517d81d41422cfa10fabd12ab3da4f61c3f9034
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50818
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/soc/amd/common/block/lpc/lpc.c | 8 ++++++++
 src/soc/amd/picasso/chip.c         | 2 --
 src/soc/amd/stoneyridge/chip.c     | 2 --
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c
index bffb9d456c..1d019a3403 100644
--- a/src/soc/amd/common/block/lpc/lpc.c
+++ b/src/soc/amd/common/block/lpc/lpc.c
@@ -319,11 +319,19 @@ static void lpc_enable_resources(struct device *dev)
 	lpc_enable_children_resources(dev);
 }
 
+#if CONFIG(HAVE_ACPI_TABLES)
+static const char *lpc_acpi_name(const struct device *dev)
+{
+	return "LPCB";
+}
+#endif
+
 static struct device_operations lpc_ops = {
 	.read_resources = lpc_read_resources,
 	.set_resources = lpc_set_resources,
 	.enable_resources = lpc_enable_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
+	.acpi_name = lpc_acpi_name,
 	.write_acpi_tables = southbridge_write_acpi_tables,
 #endif
 	.init = lpc_init,
diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c
index e0510a26de..65f815c0f9 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -39,8 +39,6 @@ static const char *soc_acpi_name(const struct device *dev)
 			return "GNB";
 		case IOMMU_DEVFN:
 			return "IOMM";
-		case LPC_DEVFN:
-			return "LPCB";
 		case SMBUS_DEVFN:
 			return "SBUS";
 		default:
diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c
index f63a7c3779..644ef668bb 100644
--- a/src/soc/amd/stoneyridge/chip.c
+++ b/src/soc/amd/stoneyridge/chip.c
@@ -81,8 +81,6 @@ const char *soc_acpi_name(const struct device *dev)
 		return "PBR8";
 	case EHCI1_DEVFN:
 		return "EHC0";
-	case LPC_DEVFN:
-		return "LPCB";
 	case SD_DEVFN:
 		return "SDCN";
 	case SMBUS_DEVFN: