diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2015-09-08 16:16:34 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-09-17 14:23:52 +0000 |
| commit | e73da80d2c63f14cdc301a2436cf9b93dc5a531f (patch) | |
| tree | efe173ba2c2485a11ea04af0a4c4e94df8292bfb /src/soc/intel/braswell/acpi | |
| parent | a1c8b34d7b1b3a8df5b86faab79010c06b037445 (diff) | |
braswell: Switch to using common ACPI _SWS code
Switch braswell to use the common code for filling out the NVS
data used by ACPI _SWS methods. This code was out of date on
braswell so also update it to provide the \_GPE.SWS method.
BUG=chrome-os-partner:40635
BRANCH=none
TEST=emerge-cyan coreboot
Change-Id: I41c2a141c15f78dc0d9482954c157f81bd0759fa
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 4c4d1ee76f337addf687ca5a9ae2da5e898c2de0
Original-Change-Id: I44424784d5d3afb06d0d58c651a9339c7b77418c
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/298230
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11649
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/soc/intel/braswell/acpi')
| -rw-r--r-- | src/soc/intel/braswell/acpi/globalnvs.asl | 3 | ||||
| -rw-r--r-- | src/soc/intel/braswell/acpi/platform.asl | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl index fe131f993a..f37bf45054 100644 --- a/src/soc/intel/braswell/acpi/globalnvs.asl +++ b/src/soc/intel/braswell/acpi/globalnvs.asl @@ -53,7 +53,8 @@ Field (GNVS, ByteAcc, NoLock, Preserve) TLVL, 8, /* 0x13 - Throttle Level */ PPCM, 8, /* 0x14 - Maximum P-state usable by OS */ PM1I, 32, /* 0x15 - System Wake Source - PM1 Index */ - BDID, 8, /* 0x19 - Board ID */ + GPEI, 32, /* 0x19 - GPE Wake Source */ + BDID, 8, /* 0x1d - Board ID */ /* Device Config */ Offset (0x20), diff --git a/src/soc/intel/braswell/acpi/platform.asl b/src/soc/intel/braswell/acpi/platform.asl index 33be9ee98e..6f5e6629cf 100644 --- a/src/soc/intel/braswell/acpi/platform.asl +++ b/src/soc/intel/braswell/acpi/platform.asl @@ -18,6 +18,9 @@ * Foundation, Inc. */ +/* Enable ACPI _SWS methods */ +#include <soc/intel/common/acpi/acpi_wake_source.asl> + /* The APM port can be used for generating software SMIs */ OperationRegion (APMP, SystemIO, 0xb2, 2) @@ -72,9 +75,3 @@ Method(_WAK,1) { Return(Package(){0,0}) } - -Method (_SWS) -{ - /* Index into PM1 for device that caused wake */ - Return (\PM1I) -} |