diff options
-rw-r--r-- | src/mainboard/google/kahlee/dsdt.asl | 2 | ||||
-rw-r--r-- | src/mainboard/google/zork/dsdt.asl | 2 | ||||
-rw-r--r-- | src/soc/amd/common/acpi/acpi_wake_source.asl (renamed from src/soc/amd/picasso/acpi/acpi_wake_source.asl) | 2 | ||||
-rw-r--r-- | src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl | 19 |
4 files changed, 4 insertions, 21 deletions
diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl index 4d920c924e..19d620e9b5 100644 --- a/src/mainboard/google/kahlee/dsdt.asl +++ b/src/mainboard/google/kahlee/dsdt.asl @@ -34,7 +34,7 @@ DefinitionBlock ( #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 0831ddd5b7..f561de3a71 100644 --- a/src/mainboard/google/zork/dsdt.asl +++ b/src/mainboard/google/zork/dsdt.asl @@ -35,7 +35,7 @@ DefinitionBlock ( #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 index e847884073..de9cb25796 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 e847884073..0000000000 --- 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) - } -} |