diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2020-10-25 19:24:44 +0100 |
|---|---|---|
| committer | Angel Pons <th3fanbus@gmail.com> | 2020-11-04 23:21:44 +0000 |
| commit | df7a887cb56b8e8f4a6734b2a2cca96517587bfa (patch) | |
| tree | 13b9bccac846c7c27a4a4603d9904f70c9e656a3 /src/southbridge | |
| parent | b0d342028ddbc47e8b21d43d47c48be3066c350a (diff) | |
sb/intel/lynxpoint: Align LP GPIO ACPI with Broadwell
Move the `GWAK` method into the GPIO device, and have lpc.c include the
LP GPIO code. All usages of `GWAK` on mainboards need to be updated.
Change-Id: Id6a41f553d133f960de8b232205ed43b832a83d2
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46775
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/southbridge')
| -rw-r--r-- | src/southbridge/intel/lynxpoint/acpi/gpio.asl | 3 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/acpi/lpc.asl | 3 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/acpi/pch.asl | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/southbridge/intel/lynxpoint/acpi/gpio.asl b/src/southbridge/intel/lynxpoint/acpi/gpio.asl index 3650b701e3..1eefcdd197 100644 --- a/src/southbridge/intel/lynxpoint/acpi/gpio.asl +++ b/src/southbridge/intel/lynxpoint/acpi/gpio.asl @@ -51,10 +51,7 @@ Device (GPIO) Return (0x0) } } -} -Scope (\_SB.PCI0.LPCB) -{ // GWAK: Setup GPIO as ACPI GPE for Wake // Arg0: GPIO Number Method (GWAK, 1, NotSerialized) diff --git a/src/southbridge/intel/lynxpoint/acpi/lpc.asl b/src/southbridge/intel/lynxpoint/acpi/lpc.asl index b95c2f06b1..8410d7ab39 100644 --- a/src/southbridge/intel/lynxpoint/acpi/lpc.asl +++ b/src/southbridge/intel/lynxpoint/acpi/lpc.asl @@ -199,5 +199,8 @@ Device (LPCB) }) } +#if CONFIG(INTEL_LYNXPOINT_LP) + #include "gpio.asl" +#endif #include "acpi/superio.asl" } diff --git a/src/southbridge/intel/lynxpoint/acpi/pch.asl b/src/southbridge/intel/lynxpoint/acpi/pch.asl index 5ac83a4ae7..a3c81887e7 100644 --- a/src/southbridge/intel/lynxpoint/acpi/pch.asl +++ b/src/southbridge/intel/lynxpoint/acpi/pch.asl @@ -76,7 +76,6 @@ Scope (\) // Serial IO #if CONFIG(INTEL_LYNXPOINT_LP) #include "serialio.asl" -#include "gpio.asl" #endif Method (_OSC, 4) |