From fca4535acf9231be90afa15cf9ef3c1058a74d62 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 18 Jun 2020 21:14:31 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/42545 Reviewed-by: Aaron Durbin Reviewed-by: Raul Rangel Tested-by: build bot (Jenkins) --- src/mainboard/google/kahlee/dsdt.asl | 2 +- src/mainboard/google/zork/dsdt.asl | 2 +- src/soc/amd/common/acpi/acpi_wake_source.asl | 21 +++++++++++++++++++++ src/soc/amd/picasso/acpi/acpi_wake_source.asl | 19 ------------------- src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl | 19 ------------------- 5 files changed, 23 insertions(+), 40 deletions(-) create mode 100644 src/soc/amd/common/acpi/acpi_wake_source.asl delete mode 100644 src/soc/amd/picasso/acpi/acpi_wake_source.asl delete mode 100644 src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl (limited to 'src') 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 /* Contains _SWS methods */ - #include + #include /* 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 /* Contains _SWS methods */ - #include + #include /* System Bus */ Scope(\_SB) { /* Start \_SB scope */ diff --git a/src/soc/amd/common/acpi/acpi_wake_source.asl b/src/soc/amd/common/acpi/acpi_wake_source.asl new file mode 100644 index 0000000000..de9cb25796 --- /dev/null +++ b/src/soc/amd/common/acpi/acpi_wake_source.asl @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* The SoC-specific code needs to provide the PM1I and GPEI fields */ + +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) + } +} diff --git a/src/soc/amd/picasso/acpi/acpi_wake_source.asl b/src/soc/amd/picasso/acpi/acpi_wake_source.asl deleted file mode 100644 index e847884073..0000000000 --- a/src/soc/amd/picasso/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) - } -} 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) - } -} -- cgit v1.2.3