diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2014-11-03 12:48:11 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-04 12:40:10 +0200 |
| commit | c37dd507e0619afd3e92e64d5a0630ac502ec76f (patch) | |
| tree | 582c46070f7ffa480200e17dcaf47838881b3aea | |
| parent | 69d7aecdaf66e50217d530aa5cb158bc15b01b85 (diff) | |
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>
| -rw-r--r-- | src/mainboard/google/samus/acpi/mainboard.asl | 6 | ||||
| -rw-r--r-- | src/mainboard/google/samus/gpio.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mainboard/google/samus/acpi/mainboard.asl b/src/mainboard/google/samus/acpi/mainboard.asl index c6ad278638..feecac3dbb 100644 --- a/src/mainboard/google/samus/acpi/mainboard.asl +++ b/src/mainboard/google/samus/acpi/mainboard.asl @@ -122,7 +122,7 @@ Scope (\_SB.PCI0.I2C0) Name (_UID, 2) Name (_S0W, 4) Name (ISTP, 1) /* Touchpad */ - Name (GPIO, 13) /* TRACKPAD_INT_L */ + Name (GPIO, 9) /* TRACKPAD_INT_L (WAKE) */ Name (_CRS, ResourceTemplate() { @@ -140,7 +140,6 @@ Scope (\_SB.PCI0.I2C0) Name (_PRW, Package() { GPIO, 3 }) -#ifdef ENABLE_TOUCH_WAKE Method (_DSW, 3, NotSerialized) { If (LEqual (Arg0, 1)) { @@ -148,7 +147,6 @@ Scope (\_SB.PCI0.I2C0) \_SB.PCI0.LPCB.GPIO.GWAK (^GPIO) } } -#endif Method (_STA) { @@ -304,9 +302,9 @@ Scope (\_SB.PCI0.I2C1) Interrupt (ResourceConsumer, Edge, ActiveLow) { 28 } }) +#ifdef ENABLE_TOUCH_WAKE Name (_PRW, Package() { GPIO, 3 }) -#ifdef ENABLE_TOUCH_WAKE Method (_DSW, 3, NotSerialized) { If (LEqual (Arg0, 1)) { diff --git a/src/mainboard/google/samus/gpio.h b/src/mainboard/google/samus/gpio.h index 393a14fe53..9f4031f1d6 100644 --- a/src/mainboard/google/samus/gpio.h +++ b/src/mainboard/google/samus/gpio.h @@ -37,7 +37,7 @@ static const struct gpio_config mainboard_gpio_config[] = { PCH_GPIO_NATIVE, /* 6: NATIVE: I2C1_SDA_GPIO6 */ PCH_GPIO_NATIVE, /* 7: NATIVE: I2C1_SCL_GPIO7 */ 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_UNUSED, /* 11: UNUSED */ PCH_GPIO_UNUSED, /* 12: UNUSED */ |