[S] Change in coreboot[master]: soc/amd/phoenix/acpi: use ROOT_BRIDGE macro

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/75594?usp=email )

Change subject: soc/amd/phoenix/acpi: use ROOT_BRIDGE macro
......................................................................

soc/amd/phoenix/acpi: use ROOT_BRIDGE macro

Use the ROOT_BRIDGE macro in soc.asl to replace the pci0.asl file. The
soc/amd/common/acpi/lpc.asl file which was included in the now removed
pci0.asl file now gets included in the correct scope in the soc.asl
file.

Signed-off-by: Felix Held 
Change-Id: If293188fc8d0ff41b47ab84c9655333e9ebe58e8
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75594
Tested-by: build bot (Jenkins) 
Reviewed-by: Matt DeVillier 
Reviewed-by: Raul Rangel 
---
D src/soc/amd/phoenix/acpi/pci0.asl
M src/soc/amd/phoenix/acpi/soc.asl
2 files changed, 6 insertions(+), 27 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Matt DeVillier: Looks good to me, approved
  Raul Rangel: Looks good to me, approved

diff --git a/src/soc/amd/phoenix/acpi/pci0.asl b/src/soc/amd/phoenix/acpi/pci0.asl
deleted file mode 100644
index 6039a5aa..0000000
--- a/src/soc/amd/phoenix/acpi/pci0.asl
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* TODO: Update for Phoenix */
-
-Device(PCI0) {
-	Name(_HID, EISAID("PNP0A08"))	/* PCI Express Root Bridge */
-	Name(_CID, EISAID("PNP0A03"))	/* PCI Root Bridge */
-
-	/* Operating System Capabilities Method */
-	Method(_OSC, 4) {
-		CreateDWordField(Arg3, 0, CDW1) /* Capabilities dword 1 */
-
-		/* Check for proper PCI/PCIe UUID */
-		If (Arg0 == ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766")) {
-			/* Let OS control everything */
-			Return (Arg3)
-		} Else {
-			CDW1 |= 4	/* Unrecognized UUID */
-			Return (Arg3)
-		}
-	}
-
-	/* 0:14.3 - LPC */
-	#include <soc/amd/common/acpi/lpc.asl>
-
-} /* End PCI0 scope */
diff --git a/src/soc/amd/phoenix/acpi/soc.asl b/src/soc/amd/phoenix/acpi/soc.asl
index 4df7835..ee2e9c8 100644
--- a/src/soc/amd/phoenix/acpi/soc.asl
+++ b/src/soc/amd/phoenix/acpi/soc.asl
@@ -2,6 +2,7 @@

/* TODO: Update for Phoenix */

+#include <soc/amd/common/acpi/pci_root.asl>
 #include "globalnvs.asl"

Scope(_SB) {
@@ -18,7 +19,11 @@

#include "mmio.asl"

-	#include "pci0.asl"
+	ROOT_BRIDGE(PCI0)
+
+	Scope(PCI0) {
+		#include <soc/amd/common/acpi/lpc.asl>
+	} /* End PCI0 scope */
 } /* End _SB scope */

#include <soc/amd/common/acpi/alib.asl>