GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Angel Pons 2020-10-25 19:24:44 +01:00
parent b0d342028d
commit df7a887cb5
8 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/google/beltino/acpi/mainboard.asl
View File

@ -18,7 +18,7 @@ Scope (\_SB.PCI0.RP01)
If (Arg0 == 1) { If (Arg0 == 1) {
// Enable GPIO as wake source // Enable GPIO as wake source
\_SB.PCI0.LPCB.GWAK (Local0) \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
} }
} }
} }
@ -40,7 +40,7 @@ Scope (\_SB.PCI0.RP02)
If (Arg0 == 1) { If (Arg0 == 1) {
// Enable GPIO as wake source // Enable GPIO as wake source
\_SB.PCI0.LPCB.GWAK (Local0) \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
} }
} }
} }

2
src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
View File

@ -40,7 +40,7 @@ Scope (\_SB.PCI0.I2C0)
Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) { If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source // Enable GPIO as wake source
\_SB.PCI0.LPCB.GWAK (Local0) \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
} }
} }

2
src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
View File

@ -40,7 +40,7 @@ Scope (\_SB.PCI0.I2C0)
Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) { If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source // Enable GPIO as wake source
\_SB.PCI0.LPCB.GWAK (Local0) \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
} }
} }

6
src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
View File

@ -40,7 +40,7 @@ Scope (\_SB.PCI0.I2C0)
Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) { If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source // Enable GPIO as wake source
\_SB.PCI0.LPCB.GWAK (Local0) \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
} }
} }
} }
@ -82,7 +82,7 @@ Scope (\_SB.PCI0.I2C0)
Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) { If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source // Enable GPIO as wake source
\_SB.PCI0.LPCB.GWAK (Local0) \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
} }
} }
@ -122,7 +122,7 @@ Scope (\_SB.PCI0.I2C1)
Store (BOARD_TOUCHSCREEN_WAKE_GPIO, Local0) Store (BOARD_TOUCHSCREEN_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) { If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source // Enable GPIO as wake source
\_SB.PCI0.LPCB.GWAK (Local0) \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
} }
} }

2
src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
View File

@ -40,7 +40,7 @@ Scope (\_SB.PCI0.I2C0)
Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
If (LEqual (Arg0, 1)) { If (LEqual (Arg0, 1)) {
// Enable GPIO as wake source // Enable GPIO as wake source
\_SB.PCI0.LPCB.GWAK (Local0) \_SB.PCI0.LPCB.GPIO.GWAK (Local0)
} }
} }

3
src/southbridge/intel/lynxpoint/acpi/gpio.asl
View File

@ -51,10 +51,7 @@ Device (GPIO)
Return (0x0) Return (0x0)
} }
} }
}
Scope (\_SB.PCI0.LPCB)
{
// GWAK: Setup GPIO as ACPI GPE for Wake // GWAK: Setup GPIO as ACPI GPE for Wake
// Arg0: GPIO Number // Arg0: GPIO Number
Method (GWAK, 1, NotSerialized) Method (GWAK, 1, NotSerialized)

3
src/southbridge/intel/lynxpoint/acpi/lpc.asl
View File

@ -199,5 +199,8 @@ Device (LPCB)
}) })
} }
#if CONFIG(INTEL_LYNXPOINT_LP)
#include "gpio.asl"
#endif
#include "acpi/superio.asl" #include "acpi/superio.asl"
} }

1
src/southbridge/intel/lynxpoint/acpi/pch.asl
View File

@ -76,7 +76,6 @@ Scope (\)
// Serial IO // Serial IO
#if CONFIG(INTEL_LYNXPOINT_LP) #if CONFIG(INTEL_LYNXPOINT_LP)
#include "serialio.asl" #include "serialio.asl"
#include "gpio.asl"
#endif #endif
Method (_OSC, 4) Method (_OSC, 4)