diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2020-10-25 21:28:09 +0100 |
|---|---|---|
| committer | Michael Niewöhner <foss@mniewoehner.de> | 2020-11-13 12:03:14 +0000 |
| commit | 59ea8ef9e1e97e85211d284f35f29fa913d86270 (patch) | |
| tree | 357f9827dd8914752ecc4b9d906089e01ae86895 /src/southbridge/intel | |
| parent | 98ea6a3f94adc9d33c52283683b423e2ced8af61 (diff) | |
sb/intel/lynxpoint/acpi: Statically define _PRW values
In order for ACPI deduplication to be reproducible, the `ISLP` method
needs to disappear. Replace the _PRW methods with a name and a macro.
Change-Id: Id0a46965b66f1a70e8f8868af01a535207c9f5c7
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46780
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/southbridge/intel')
| -rw-r--r-- | src/southbridge/intel/lynxpoint/acpi/audio.asl | 12 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/acpi/pch.asl | 6 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/acpi/usb.asl | 22 |
3 files changed, 9 insertions, 31 deletions
diff --git a/src/southbridge/intel/lynxpoint/acpi/audio.asl b/src/southbridge/intel/lynxpoint/acpi/audio.asl index 98cdac9a90..43f2150b62 100644 --- a/src/southbridge/intel/lynxpoint/acpi/audio.asl +++ b/src/southbridge/intel/lynxpoint/acpi/audio.asl @@ -7,15 +7,5 @@ Device (HDEF) { Name (_ADR, 0x001b0000) - - Name (PRWH, Package (){ 0x0d, 3 }) // LPT-H - Name (PRWL, Package (){ 0x6d, 3 }) // LPT-LP - - Method (_PRW, 0) { // Power Resources for Wake - If (\ISLP ()) { - Return (PRWL) - } Else { - Return (PRWH) - } - } + Name (_PRW, Package () { DEFAULT_PRW_VALUE, 3 }) } diff --git a/src/southbridge/intel/lynxpoint/acpi/pch.asl b/src/southbridge/intel/lynxpoint/acpi/pch.asl index cb5b823997..e683c752ce 100644 --- a/src/southbridge/intel/lynxpoint/acpi/pch.asl +++ b/src/southbridge/intel/lynxpoint/acpi/pch.asl @@ -2,6 +2,12 @@ /* Intel Lynx Point PCH support */ +#if CONFIG(INTEL_LYNXPOINT_LP) +#define DEFAULT_PRW_VALUE 0x6d +#else +#define DEFAULT_PRW_VALUE 0x0d +#endif + Scope (\) { // Return TRUE if chipset is LynxPoint-LP diff --git a/src/southbridge/intel/lynxpoint/acpi/usb.asl b/src/southbridge/intel/lynxpoint/acpi/usb.asl index e807398cb5..fbb7090819 100644 --- a/src/southbridge/intel/lynxpoint/acpi/usb.asl +++ b/src/southbridge/intel/lynxpoint/acpi/usb.asl @@ -6,16 +6,7 @@ Device (EHCI) { Name (_ADR, 0x001d0000) - Name (PRWH, Package (){ 0x0d, 3 }) // LPT-H - Name (PRWL, Package (){ 0x6d, 3 }) // LPT-LP - - Method (_PRW, 0) { // Power Resources for Wake - If (\ISLP ()) { - Return (PRWL) - } Else { - Return (PRWH) - } - } + Name (_PRW, Package () { DEFAULT_PRW_VALUE, 3 }) // Leave USB ports on for to allow Wake from USB @@ -337,16 +328,7 @@ Device (XHCI) Return () } - Name (PRWH, Package (){ 0x0d, 3 }) // LPT-H - Name (PRWL, Package (){ 0x6d, 3 }) // LPT-LP - - Method (_PRW, 0) { // Power Resources for Wake - If (\ISLP ()) { - Return (PRWL) - } Else { - Return (PRWH) - } - } + Name (_PRW, Package () { DEFAULT_PRW_VALUE, 3 }) // Leave USB ports on for to allow Wake from USB |