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

samus: Enable GPIO9 as touchpad wake 

With EVT2 systems GPIO9 is now used for touchpad wake.

BUG=chrome-os-partner:32232
BRANCH=samus
TEST=suspend/resume by touchpad on samus, with kernel workaround
to disable setting of T19 in atmel driver mxt_suspend()

51 | 2014-11-03 12:41:34 | ACPI Enter | S3
52 | 2014-11-03 12:41:37 | ACPI Wake | S3
53 | 2014-11-03 12:41:37 | Wake Source | GPIO | 9

Change-Id: I67c1a6591dc287fc780889950e78c731a5a65d44
Signed-off-by: Stefan Reinauer <reinauer@chromium.org>
Original-Commit-Id: 8512a6e5266edaf77d300f47bd26c501f00361d7
Original-Change-Id: I8120747986e694b64d464826f87c9afa68af157a
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/227157
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9271
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Duncan Laurie 2014-11-03 12:48:11 -08:00 committed by Patrick Georgi
parent 69d7aecdaf
commit c37dd507e0
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainboard/google/samus/acpi/mainboard.asl
View File

@ -122,7 +122,7 @@ Scope (\_SB.PCI0.I2C0)
Name (_UID, 2) Name (_UID, 2)
Name (_S0W, 4) Name (_S0W, 4)
Name (ISTP, 1) /* Touchpad */ Name (ISTP, 1) /* Touchpad */
Name (GPIO, 13) /* TRACKPAD_INT_L */ Name (GPIO, 9) /* TRACKPAD_INT_L (WAKE) */
Name (_CRS, ResourceTemplate() Name (_CRS, ResourceTemplate()
{ {
@ -140,7 +140,6 @@ Scope (\_SB.PCI0.I2C0)
Name (_PRW, Package() { GPIO, 3 }) Name (_PRW, Package() { GPIO, 3 })
#ifdef ENABLE_TOUCH_WAKE
Method (_DSW, 3, NotSerialized) Method (_DSW, 3, NotSerialized)
{ {
If (LEqual (Arg0, 1)) { If (LEqual (Arg0, 1)) {
@ -148,7 +147,6 @@ Scope (\_SB.PCI0.I2C0)
\_SB.PCI0.LPCB.GPIO.GWAK (^GPIO) \_SB.PCI0.LPCB.GPIO.GWAK (^GPIO)
} }
} }
#endif
Method (_STA) Method (_STA)
{ {
@ -304,9 +302,9 @@ Scope (\_SB.PCI0.I2C1)
Interrupt (ResourceConsumer, Edge, ActiveLow) { 28 } Interrupt (ResourceConsumer, Edge, ActiveLow) { 28 }
}) })
#ifdef ENABLE_TOUCH_WAKE
Name (_PRW, Package() { GPIO, 3 }) Name (_PRW, Package() { GPIO, 3 })
#ifdef ENABLE_TOUCH_WAKE
Method (_DSW, 3, NotSerialized) Method (_DSW, 3, NotSerialized)
{ {
If (LEqual (Arg0, 1)) { If (LEqual (Arg0, 1)) {

2
src/mainboard/google/samus/gpio.h
View File

@ -37,7 +37,7 @@ static const struct gpio_config mainboard_gpio_config[] = {
PCH_GPIO_NATIVE, /* 6: NATIVE: I2C1_SDA_GPIO6 */ PCH_GPIO_NATIVE, /* 6: NATIVE: I2C1_SDA_GPIO6 */
PCH_GPIO_NATIVE, /* 7: NATIVE: I2C1_SCL_GPIO7 */ PCH_GPIO_NATIVE, /* 7: NATIVE: I2C1_SCL_GPIO7 */
PCH_GPIO_ACPI_SCI, /* 8: PCH_LTE_WAKE_L */ PCH_GPIO_ACPI_SCI, /* 8: PCH_LTE_WAKE_L */
PCH_GPIO_UNUSED, /* 9: UNUSED */ PCH_GPIO_INPUT_INVERT, /* 9: TRACKPAD_INT_L (WAKE) */
PCH_GPIO_ACPI_SCI, /* 10: PCH_WLAN_WAKE_L */ PCH_GPIO_ACPI_SCI, /* 10: PCH_WLAN_WAKE_L */
PCH_GPIO_UNUSED, /* 11: UNUSED */ PCH_GPIO_UNUSED, /* 11: UNUSED */
PCH_GPIO_UNUSED, /* 12: UNUSED */ PCH_GPIO_UNUSED, /* 12: UNUSED */