From 2b7103cb0ff066e3fa1fac5a40fe361334dd6570 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 10 Nov 2015 15:00:18 +0800 Subject: [PATCH] google/lars: Enable wake from touch pad This patch enables GPP_B5 as ACPI_SCI for wake. It also defines touchpad wake device in ACPI with GPE0_DW0_05 for _PRW. BUG=none BRANCH=none TEST=emerge-lars coreboot Change-Id: I2b65f6a37783ecdbdbc32ebe613243e042c865e9 Signed-off-by: Patrick Georgi Original-Commit-Id: ec5b629f920984564f12f2c09458ed300d031f69 Original-Change-Id: I9bd2b3595ae833fa5d07d97a7cda4a29041be837 Original-Signed-off-by: David Wu Original-Reviewed-on: https://chromium-review.googlesource.com/311890 Original-Commit-Ready: David Wu Original-Tested-by: David Wu Original-Reviewed-by: Shawn N Reviewed-on: http://review.coreboot.org/12449 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/google/lars/acpi/mainboard.asl | 2 ++ src/mainboard/google/lars/gpio.h | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mainboard/google/lars/acpi/mainboard.asl b/src/mainboard/google/lars/acpi/mainboard.asl index 8ac349bdc7..a5a90c657b 100644 --- a/src/mainboard/google/lars/acpi/mainboard.asl +++ b/src/mainboard/google/lars/acpi/mainboard.asl @@ -124,6 +124,8 @@ Scope (\_SB.PCI0.I2C1) } }) + Name (_PRW, Package() { GPE_TOUCHPAD_WAKE, 0x3 }) + Method (_STA) { Return (0xF) diff --git a/src/mainboard/google/lars/gpio.h b/src/mainboard/google/lars/gpio.h index 80a97fd1ff..7ebeb5d7a3 100755 --- a/src/mainboard/google/lars/gpio.h +++ b/src/mainboard/google/lars/gpio.h @@ -38,6 +38,9 @@ /* GPP_B16 is WLAN_WAKE. GPP_B group is routed to DW0 in the GPE0 block */ #define GPE_WLAN_WAKE GPE0_DW0_16 +/* GPP_B5 is TOUCHPAD WAKE. GPP_B group is routed to DW0 in the GPE0 block */ +#define GPE_TOUCHPAD_WAKE GPE0_DW0_05 + /* Input device interrupt configuration */ #define TOUCHPAD_INT_L GPP_B3_IRQ #define TOUCHSCREEN_INT_L GPP_E7_IRQ @@ -79,7 +82,7 @@ static const struct pad_config gpio_table[] = { /* HSJ_MIC_DET */ PAD_CFG_GPI(GPP_B2, NONE, DEEP), /* TRACKPAD_INT */ PAD_CFG_GPI_APIC(GPP_B3, NONE, DEEP), /* BT_RF_KILL */ PAD_CFG_GPO(GPP_B4, 0, DEEP), -/* SRCCLKREQ0# */ /* GPP_B5 */ +/* SRCCLKREQ0# */ PAD_CFG_GPI_ACPI_SCI(GPP_B5, NONE, DEEP, YES), /* TOUCHPAD WAKE */ /* WIFI_CLK_REQ */ PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1), /* KEPLR_CLK_REQ */ PAD_CFG_NF(GPP_B7, NONE, DEEP, NF1), /* SRCCLKREQ3# */ /* GPP_B8 */