summaryrefslogtreecommitdiff
path: root/src/mainboard/google/volteer/variants
diff options
context:
space:
mode:
authorWilliam Wei <wenxu.wei@bitland.corp-partner.google.com>2020-05-20 14:30:13 +0800
committerPatrick Georgi <pgeorgi@google.com>2020-05-26 15:05:48 +0000
commitd9cd064ac66148293385671160e56bd1c2664015 (patch)
tree426f3dad6d579b7e3978f9c1c2e3a622cafc3055 /src/mainboard/google/volteer/variants
parent4751390b61fcf61ad319dfb59857fa3d5c12ccda (diff)
downloadcoreboot-d9cd064ac66148293385671160e56bd1c2664015.tar.xz
mb/google/volteer: Enable ELAN trackpad wake suspend function
BUG=b:156990317 TEST=emerge-volteer coreboot chromeos-bootimage Boot to kernel and check the ELAN trackpad can wake up unit from suspend. Signed-off-by: William Wei <wenxu.wei@bitland.corp-partner.google.com> Change-Id: If4bea8a9742f7533be2e51b855cc39ca77d73608 Reviewed-on: https://review.coreboot.org/c/coreboot/+/41556 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/google/volteer/variants')
-rw-r--r--src/mainboard/google/volteer/variants/baseboard/devicetree.cb3
-rw-r--r--src/mainboard/google/volteer/variants/baseboard/gpio.c2
-rw-r--r--src/mainboard/google/volteer/variants/malefor/gpio.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index 25b42c74f7..693369542b 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -350,7 +350,8 @@ chip soc/intel/tigerlake
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
- register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E15_IRQ)"
+ register "irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_E15_IRQ)"
+ register "wake" = "GPE0_DW2_15"
register "probed" = "1"
device i2c 15 on end
end
diff --git a/src/mainboard/google/volteer/variants/baseboard/gpio.c b/src/mainboard/google/volteer/variants/baseboard/gpio.c
index 8cbda1c0cb..3290f44ad5 100644
--- a/src/mainboard/google/volteer/variants/baseboard/gpio.c
+++ b/src/mainboard/google/volteer/variants/baseboard/gpio.c
@@ -225,7 +225,7 @@ static const struct pad_config gpio_table[] = {
/* E14 : DDPC_HPDA ==> SOC_EDP_HPD */
PAD_CFG_NF(GPP_E14, NONE, DEEP, NF1),
/* E15 : ISH_GP6 ==> TRACKPAD_INT_ODL */
- PAD_CFG_GPI_APIC(GPP_E15, NONE, PLTRST, LEVEL, INVERT),
+ PAD_CFG_GPI_IRQ_WAKE(GPP_E15, NONE, DEEP, LEVEL, INVERT),
/* E16 : ISH_GP7 ==> WWAN_SIM1_DET_OD */
PAD_CFG_GPI(GPP_E16, NONE, DEEP),
/* E17 : THC0_SPI1_INT# ==> WWAN_PERST_L */
diff --git a/src/mainboard/google/volteer/variants/malefor/gpio.c b/src/mainboard/google/volteer/variants/malefor/gpio.c
index bd66acd57c..d3c36f851e 100644
--- a/src/mainboard/google/volteer/variants/malefor/gpio.c
+++ b/src/mainboard/google/volteer/variants/malefor/gpio.c
@@ -220,7 +220,7 @@ static const struct pad_config gpio_table[] = {
/* E14 : DDPC_HPDA ==> SOC_EDP_HPD */
PAD_CFG_NF(GPP_E14, NONE, DEEP, NF1),
/* E15 : ISH_GP6 ==> TRACKPAD_INT_ODL */
- PAD_CFG_GPI_APIC(GPP_E15, NONE, PLTRST, LEVEL, INVERT),
+ PAD_CFG_GPI_IRQ_WAKE(GPP_E15, NONE, DEEP, LEVEL, INVERT),
/* E16 : ISH_GP7 ==> NOT USED */
PAD_NC(GPP_E16, NONE),
/* E17 : THC0_SPI1_INT# ==> NOT USED */