soc/intel/common/acpi: drop the southridge scope around PEPD

PEPD will get included directly in the southbridge. Thus, drop the
scope around it.

Change-Id: Icb7a40e476966a7aca36bee055ee71d181508b87
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47246
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 70 insertions, 73 deletions

diff --git a/src/soc/intel/common/block/acpi/acpi/pep.asl b/src/soc/intel/common/block/acpi/acpi/pep.asl
index 6159685b53..19ec558a61 100644
--- a/src/soc/intel/common/block/acpi/acpi/pep.asl
+++ b/src/soc/intel/common/block/acpi/acpi/pep.asl
@@ -14,90 +14,87 @@ External(\_SB.PCI0.LPCB.EC0.S0IX, MethodObj)
 External(\_SB.PCI0.EGPM, MethodObj)
 External(\_SB.PCI0.RGPM, MethodObj)
 
-Scope(\_SB)
+Device(LPID)
 {
-	Device(LPID)
+	Name(_ADR, 0x00000000)
+	Name(_CID, EISAID("PNP0D80"))
+	Name(UUID, ToUUID("c4eb40a0-6cd2-11e2-bcfd-0800200c9a66"))
+	Method(_DSM, 4)
 	{
-		Name(_ADR, 0x00000000)
-		Name(_CID, EISAID("PNP0D80"))
-		Name(UUID, ToUUID("c4eb40a0-6cd2-11e2-bcfd-0800200c9a66"))
-		Method(_DSM, 4)
-		{
-			If(Arg0 == ^UUID) {
-				/*
-				 * Enum functions
-				 */
-				If(Arg2 == LPID_DSM_ARG2_ENUM_FUNCTIONS) {
-					Return(Buffer(One) {0x60})
-				}
-				/*
-				 * Function 1 - Get Device Constraints
-				 */
-				If(Arg2 == LPID_DSM_ARG2_GET_DEVICE_CONSTRAINTS) {
-					Return(Package(5) {0, Ones, Ones, Ones, Ones})
+		If(Arg0 == ^UUID) {
+			/*
+			 * Enum functions
+			 */
+			If(Arg2 == LPID_DSM_ARG2_ENUM_FUNCTIONS) {
+				Return(Buffer(One) {0x60})
+			}
+			/*
+			 * Function 1 - Get Device Constraints
+			 */
+			If(Arg2 == LPID_DSM_ARG2_GET_DEVICE_CONSTRAINTS) {
+				Return(Package(5) {0, Ones, Ones, Ones, Ones})
+			}
+			/*
+			 * Function 2 - Get Crash Dump Device
+			 */
+			If(Arg2 == LPID_DSM_ARG2_GET_CRASH_DUMP_DEV) {
+				Return(Buffer(One) {0x0})
+			}
+			/*
+			 * Function 3 - Display Off Notification
+			 */
+			If(Arg2 == LPID_DSM_ARG2_DISPLAY_OFF_NOTIFY) {
+			}
+			/*
+			 * Function 4 - Display On Notification
+			 */
+			If(Arg2 == LPID_DSM_ARG2_DISPLAY_ON_NOTIFY) {
+			}
+			/*
+			 * Function 5 - Low Power S0 Entry Notification
+			 */
+			If(Arg2 == LPID_DSM_ARG2_S0IX_ENTRY) {
+				/* Inform the EC */
+				If (CondRefOf (\_SB.PCI0.LPCB.EC0.S0IX)) {
+					\_SB.PCI0.LPCB.EC0.S0IX(1)
 				}
-				/*
-				 * Function 2 - Get Crash Dump Device
-				 */
-				If(Arg2 == LPID_DSM_ARG2_GET_CRASH_DUMP_DEV) {
-					Return(Buffer(One) {0x0})
+
+				/* provide board level S0ix hook */
+				If (CondRefOf (\_SB.MS0X)) {
+					\_SB.MS0X(1)
 				}
+
 				/*
-				 * Function 3 - Display Off Notification
+				 * Save the current PM bits then
+				 * enable GPIO PM with MISCCFG_ENABLE_GPIO_PM_CONFIG
 				 */
-				If(Arg2 == LPID_DSM_ARG2_DISPLAY_OFF_NOTIFY) {
+				If (CondRefOf (\_SB.PCI0.EGPM))
+				{
+					\_SB.PCI0.EGPM ()
 				}
-				/*
-				 * Function 4 - Display On Notification
-				 */
-				If(Arg2 == LPID_DSM_ARG2_DISPLAY_ON_NOTIFY) {
+			}
+			/*
+			 * Function 6 - Low Power S0 Exit Notification
+			 */
+			If(Arg2 == LPID_DSM_ARG2_S0IX_EXIT) {
+				/* Inform the EC */
+				If (CondRefOf (\_SB.PCI0.LPCB.EC0.S0IX)) {
+					\_SB.PCI0.LPCB.EC0.S0IX(0)
 				}
-				/*
-				 * Function 5 - Low Power S0 Entry Notification
-				 */
-				If(Arg2 == LPID_DSM_ARG2_S0IX_ENTRY) {
-					/* Inform the EC */
-					If (CondRefOf (\_SB.PCI0.LPCB.EC0.S0IX)) {
-						\_SB.PCI0.LPCB.EC0.S0IX(1)
-					}
-
-					/* provide board level S0ix hook */
-					If (CondRefOf (\_SB.MS0X)) {
-						\_SB.MS0X(1)
-					}
 
-					/*
-					 * Save the current PM bits then
-					 * enable GPIO PM with MISCCFG_ENABLE_GPIO_PM_CONFIG
-					 */
-					If (CondRefOf (\_SB.PCI0.EGPM))
-					{
-						\_SB.PCI0.EGPM ()
-					}
+				/* provide board level S0ix hook */
+				If (CondRefOf (\_SB.MS0X)) {
+					\_SB.MS0X(0)
 				}
-				/*
-				 * Function 6 - Low Power S0 Exit Notification
-				 */
-				If(Arg2 == LPID_DSM_ARG2_S0IX_EXIT) {
-					/* Inform the EC */
-					If (CondRefOf (\_SB.PCI0.LPCB.EC0.S0IX)) {
-						\_SB.PCI0.LPCB.EC0.S0IX(0)
-					}
-
-					/* provide board level S0ix hook */
-					If (CondRefOf (\_SB.MS0X)) {
-						\_SB.MS0X(0)
-					}
 
-					/* Restore GPIO all Community PM */
-					If (CondRefOf (\_SB.PCI0.RGPM))
-					{
-						\_SB.PCI0.RGPM ()
-					}
+				/* Restore GPIO all Community PM */
+				If (CondRefOf (\_SB.PCI0.RGPM))
+				{
+					\_SB.PCI0.RGPM ()
 				}
 			}
+		}
 
-			Return(Buffer(One) {0x00})
-		}		// Method(_DSM)
-	}			// Device (LPID)
-}				// End Scope(\_SB)
+		Return(Buffer(One) {0x00})
+	}		// Method(_DSM)
+}			// Device (LPID)