soc/intel/common/block/lpc: add acpi name

Add ACPI name for LPC device. The name matches with what is in
soc/intel/common/block/acpi/acpi/lpc.asl.

Since several Intel SOCs select CONFIG_SOC_INTEL_COMMON_BLOCK_LPC,
remove duplicated acpi name assignments.

Signed-off-by: Jonathan Zhang <jonzhang@fb.com>
Change-Id: If418c83caafe5d9e2af135a8946cbe5eb687b9ef
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45590
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>

8 files changed, 8 insertions, 13 deletions

diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 9f73727b65..96b0900190 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -139,9 +139,6 @@ const char *soc_acpi_name(const struct device *dev)
 	/* DSDT: acpi/northbridge.asl */
 	case SA_DEVFN_ROOT:
 		return "MCHC";
-	/* DSDT: acpi/lpc.asl */
-	case PCH_DEVFN_LPC:
-		return "LPCB";
 	/* DSDT: acpi/xhci.asl */
 	case PCH_DEVFN_XHCI:
 		return "XHCI";
diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c
index ef85215623..17698460f7 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/chip.c
@@ -127,7 +127,6 @@ const char *soc_acpi_name(const struct device *dev)
 	case PCH_DEVFN_GSPI2:	return "SPI2";
 	case PCH_DEVFN_EMMC:	return "EMMC";
 	case PCH_DEVFN_SDCARD:	return "SDXC";
-	case PCH_DEVFN_LPC:	return "LPCB";
 	case PCH_DEVFN_P2SB:	return "P2SB";
 	case PCH_DEVFN_PMC:	return "PMC_";
 	case PCH_DEVFN_HDA:	return "HDAS";
diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c
index 212fd70478..28c030f032 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -95,6 +95,13 @@ static void pch_lpc_set_resources(struct device *dev)
 	pch_lpc_set_child_resources(dev);
 }
 
+#if CONFIG(HAVE_ACPI_TABLES)
+static const char *lpc_acpi_name(const struct device *dev)
+{
+	return "LPCB";
+}
+#endif
+
 static struct device_operations device_ops = {
 	.read_resources		= pch_lpc_read_resources,
 	.set_resources		= pch_lpc_set_resources,
@@ -102,6 +109,7 @@ static struct device_operations device_ops = {
 #if CONFIG(HAVE_ACPI_TABLES)
 	.write_acpi_tables	= southbridge_write_acpi_tables,
 	.acpi_inject_dsdt	= southbridge_inject_dsdt,
+	.acpi_name		= lpc_acpi_name,
 #endif
 	.init			= lpc_soc_init,
 	.scan_bus		= scan_static_bus,
diff --git a/src/soc/intel/elkhartlake/chip.c b/src/soc/intel/elkhartlake/chip.c
index e4884efea1..cd65260c10 100644
--- a/src/soc/intel/elkhartlake/chip.c
+++ b/src/soc/intel/elkhartlake/chip.c
@@ -95,8 +95,6 @@ const char *soc_acpi_name(const struct device *dev)
 	case PCH_DEVFN_GSPI3:   return "SPI3";
 	case PCH_DEVFN_EMMC:	return "EMMC";
 	case PCH_DEVFN_SDCARD:	return "SDXC";
-	/* Keeping ACPI device name coherent with ec.asl */
-	case PCH_DEVFN_ESPI:	return "LPCB";
 	case PCH_DEVFN_HDA:	return "HDAS";
 	case PCH_DEVFN_SMBUS:	return "SBUS";
 	case PCH_DEVFN_GBE:	return "GLAN";
diff --git a/src/soc/intel/icelake/chip.c b/src/soc/intel/icelake/chip.c
index a455bfce71..d0ea732df3 100644
--- a/src/soc/intel/icelake/chip.c
+++ b/src/soc/intel/icelake/chip.c
@@ -75,8 +75,6 @@ const char *soc_acpi_name(const struct device *dev)
 	case PCH_DEVFN_GSPI2:	return "SPI2";
 	case PCH_DEVFN_EMMC:	return "EMMC";
 	case PCH_DEVFN_SDCARD:	return "SDXC";
-	/* Keeping ACPI device name coherent with ec.asl */
-	case PCH_DEVFN_ESPI:	return "LPCB";
 	case PCH_DEVFN_P2SB:	return "P2SB";
 	case PCH_DEVFN_PMC:	return "PMC_";
 	case PCH_DEVFN_HDA:	return "HDAS";
diff --git a/src/soc/intel/jasperlake/chip.c b/src/soc/intel/jasperlake/chip.c
index 36e0175c2b..d34ef557df 100644
--- a/src/soc/intel/jasperlake/chip.c
+++ b/src/soc/intel/jasperlake/chip.c
@@ -95,8 +95,6 @@ const char *soc_acpi_name(const struct device *dev)
 	case PCH_DEVFN_GSPI3:   return "SPI3";
 	case PCH_DEVFN_EMMC:	return "EMMC";
 	case PCH_DEVFN_SDCARD:	return "SDXC";
-	/* Keeping ACPI device name coherent with ec.asl */
-	case PCH_DEVFN_ESPI:	return "LPCB";
 	case PCH_DEVFN_HDA:	return "HDAS";
 	case PCH_DEVFN_SMBUS:	return "SBUS";
 	case PCH_DEVFN_GBE:	return "GLAN";
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index eb5b5b0efb..275e77df1a 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -688,7 +688,6 @@ const char *soc_acpi_name(const struct device *dev)
 	case PCH_DEVFN_EMMC:	return "EMMC";
 	case PCH_DEVFN_SDIO:	return "SDIO";
 	case PCH_DEVFN_SDCARD:	return "SDXC";
-	case PCH_DEVFN_LPC:	return "LPCB";
 	case PCH_DEVFN_P2SB:	return "P2SB";
 	case PCH_DEVFN_PMC:	return "PMC_";
 	case PCH_DEVFN_HDA:	return "HDAS";
diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c
index d3c3c62761..98ed55ca58 100644
--- a/src/soc/intel/tigerlake/chip.c
+++ b/src/soc/intel/tigerlake/chip.c
@@ -104,8 +104,6 @@ const char *soc_acpi_name(const struct device *dev)
 	case PCH_DEVFN_GSPI1:		return "SPI1";
 	case PCH_DEVFN_GSPI2:		return "SPI2";
 	case PCH_DEVFN_GSPI3:		return "SPI3";
-	/* Keeping ACPI device name coherent with ec.asl */
-	case PCH_DEVFN_ESPI:		return "LPCB";
 	case PCH_DEVFN_HDA:		return "HDAS";
 	case PCH_DEVFN_SMBUS:		return "SBUS";
 	case PCH_DEVFN_GBE:		return "GLAN";