From 2261e91ad8874e4f50ec4fc1b201c9f005b8f480 Mon Sep 17 00:00:00 2001 From: Caveh Jalali Date: Wed, 25 Apr 2018 20:08:52 -0700 Subject: google/poppy: enable trackpad as wake source This configures GPP_A23 as a wake source for the trackpad. We also need to set up GPP_A GPE0_DW0, thus evicting GPP_B. We don't have any interesting signals in GPP_B, so we won't be missing it. I don't have hardware with A23 wired up, so i just tested the wake source using A19 which is essentially identical to A23. BUG=b:78541883 TEST=verified we can trackpad can wake system from suspend Change-Id: If800464c8b2319d758b1823850571919f85bdc6c Signed-off-by: Caveh Jalali Reviewed-on: https://review.coreboot.org/25850 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/mainboard/google/poppy/variants/atlas/devicetree.cb | 5 ++--- src/mainboard/google/poppy/variants/atlas/gpio.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mainboard/google/poppy/variants/atlas/devicetree.cb b/src/mainboard/google/poppy/variants/atlas/devicetree.cb index 4444549784..8ae9b058e7 100644 --- a/src/mainboard/google/poppy/variants/atlas/devicetree.cb +++ b/src/mainboard/google/poppy/variants/atlas/devicetree.cb @@ -11,7 +11,7 @@ chip soc/intel/skylake # Note that GPE events called out in ASL code rely on this # route. i.e. If this route changes then the affected GPE # offset bits also need to be changed. - register "gpe0_dw0" = "GPP_B" + register "gpe0_dw0" = "GPP_A" register "gpe0_dw1" = "GPP_D" register "gpe0_dw2" = "GPP_E" @@ -252,8 +252,7 @@ chip soc/intel/skylake register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A19_IRQ)" - # TODO(caveh): fix wake source - #register "wake" = "GPE0_DWx_19" not possible? + register "wake" = "GPE0_DW0_23" # GPP_A23 register "probed" = "1" # may not be present device i2c 0x15 on end end diff --git a/src/mainboard/google/poppy/variants/atlas/gpio.c b/src/mainboard/google/poppy/variants/atlas/gpio.c index 58b709eb5c..c1b3ccccee 100644 --- a/src/mainboard/google/poppy/variants/atlas/gpio.c +++ b/src/mainboard/google/poppy/variants/atlas/gpio.c @@ -59,8 +59,8 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NC(GPP_A21), /* A22 : ISH_GP4 */ PAD_CFG_NC(GPP_A22), - /* A23 : ISH_GP5 */ - PAD_CFG_NC(GPP_A23), + /* A23 : ISH_GP5 ==> TRACKPAD_INT_L */ + PAD_CFG_GPI_ACPI_SCI(GPP_A23, NONE, DEEP, INVERT), /* B0 : CORE_VID0 ==> NC(TP42) */ PAD_CFG_NC(GPP_B0), -- cgit v1.2.3