From 7b4110b1bf476adddbec71b7bfa9da8d8d8401a3 Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Tue, 11 Mar 2025 10:05:05 -0500
Subject: [PATCH] soc/intel/cannonlake: Use common ACPI code for SRAM and HECI

Use the newly-created ACPI devices in common/acpi, and adjust the
SoC ACPI name for the CSE/HECI device to match.

Change-Id: Id7b68e7c5ed554639dc14e837e311552c3ff92f0
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86815
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
---
 src/soc/intel/cannonlake/acpi/pcie.asl        | 10 ----------
 src/soc/intel/cannonlake/acpi/southbridge.asl |  6 ++++++
 src/soc/intel/cannonlake/chip.c               |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/soc/intel/cannonlake/acpi/pcie.asl b/src/soc/intel/cannonlake/acpi/pcie.asl
index 21e7925cc0..302863baba 100644
--- a/src/soc/intel/cannonlake/acpi/pcie.asl
+++ b/src/soc/intel/cannonlake/acpi/pcie.asl
@@ -521,13 +521,3 @@ Device (RP24)
 	}
 }
 #endif
-
-Device (SRAM)
-{
-	Name (_ADR, 0x00140002)
-}
-
-Device (CSE1)
-{
-	Name (_ADR, 0x00160000)
-}
diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl
index 20d4bfd897..322c8ff7a3 100644
--- a/src/soc/intel/cannonlake/acpi/southbridge.asl
+++ b/src/soc/intel/cannonlake/acpi/southbridge.asl
@@ -34,6 +34,12 @@
 /* USB XHCI 0:14.0 */
 #include "xhci.asl"
 
+/* PMC Shared SRAM 0:14.2 */
+#include <soc/intel/common/block/acpi/acpi/sram.asl>
+
+/* CSE/HECI #1 0:16.0 */
+#include <soc/intel/common/block/acpi/acpi/heci.asl>
+
 /* PCI _OSC */
 #include <soc/intel/common/acpi/pci_osc.asl>
 
diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c
index e2e4a6bda5..11bd9b6148 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/chip.c
@@ -90,7 +90,7 @@ const char *soc_acpi_name(const struct device *dev)
 	case PCH_DEVFN_I2C1:	return "I2C1";
 	case PCH_DEVFN_I2C2:	return "I2C2";
 	case PCH_DEVFN_I2C3:	return "I2C3";
-	case PCH_DEVFN_CSE:	return "CSE1";
+	case PCH_DEVFN_CSE:	return "HECI";
 	case PCH_DEVFN_CSE_2:	return "CSE2";
 	case PCH_DEVFN_CSE_IDER:	return "CSED";
 	case PCH_DEVFN_CSE_KT:	return "CSKT";