Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42545 )
Change subject: soc/amd: move acpi_wake_source.asl to common directory ......................................................................
soc/amd: move acpi_wake_source.asl to common directory
Files are both identical and common for both SoCs.
Change-Id: I54b78108d342a0fd03bf70ffe6a09695c5678eb4 Signed-off-by: Felix Held felix-coreboot@felixheld.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/42545 Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Raul Rangel rrangel@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/kahlee/dsdt.asl M src/mainboard/google/zork/dsdt.asl R src/soc/amd/common/acpi/acpi_wake_source.asl D src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl 4 files changed, 4 insertions(+), 21 deletions(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved Raul Rangel: Looks good to me, approved
diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl index 4d920c9..19d620e 100644 --- a/src/mainboard/google/kahlee/dsdt.asl +++ b/src/mainboard/google/kahlee/dsdt.asl @@ -34,7 +34,7 @@ #include <variant/acpi/sleep.asl>
/* Contains _SWS methods */ - #include <acpi_wake_source.asl> + #include <soc/amd/common/acpi/acpi_wake_source.asl>
/* System Bus */ Scope(_SB) { /* Start _SB scope */ diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl index 0831ddd..f561de3 100644 --- a/src/mainboard/google/zork/dsdt.asl +++ b/src/mainboard/google/zork/dsdt.asl @@ -35,7 +35,7 @@ #include <variant/acpi/sleep.asl>
/* Contains _SWS methods */ - #include <acpi_wake_source.asl> + #include <soc/amd/common/acpi/acpi_wake_source.asl>
/* System Bus */ Scope(_SB) { /* Start _SB scope */ diff --git a/src/soc/amd/picasso/acpi/acpi_wake_source.asl b/src/soc/amd/common/acpi/acpi_wake_source.asl similarity index 78% rename from src/soc/amd/picasso/acpi/acpi_wake_source.asl rename to src/soc/amd/common/acpi/acpi_wake_source.asl index e847884..de9cb25 100644 --- a/src/soc/amd/picasso/acpi/acpi_wake_source.asl +++ b/src/soc/amd/common/acpi/acpi_wake_source.asl @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
+/* The SoC-specific code needs to provide the PM1I and GPEI fields */ + Scope (_SB) { Method (_SWS) diff --git a/src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl b/src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl deleted file mode 100644 index e847884..0000000 --- a/src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -Scope (_SB) -{ - Method (_SWS) - { - /* Index into PM1 for device that caused wake */ - Return (\PM1I) - } -} - -Scope (_GPE) -{ - Method (_SWS) - { - /* Index into GPE for device that caused wake */ - Return (\GPEI) - } -}