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

mb/google/hatch: Enable wake from trackpad 

For some reason, wake does not currently work from GPP_D21, but IRQs
are working fine from that gpio.  Thus, we have to switch IRQ to
GPP_D21 and wake to GPP_A21, which was previously used for IRQs from
the trackpad.  Additionally, we need to use two gpios for irqs and
wake source at the moment because of b:123967687, where FSP is locking
down PCR and configuring ITSS.  We need to configure the wake source
gpio as inverted and the IRQ gpio as non-inverted until the bug is
resolved.

BUG=b:121212459
BRANCH=None
TEST=run evtest with trackpad
     Use trackpad with ChromeOS UI and make sure it reacts as expected.
     Run powerd_dbus_suspend and press trackpad and make sure DUT
     wakes.

Change-Id: I7b236136befc05c6586d9ba69185ed4b5d385273
Signed-off-by: Shelley Chen <shchen@google.com>
Reviewed-on: https://review.coreboot.org/c/31533
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Shelley Chen 2019-02-20 14:09:25 -08:00
parent 71c0a94987
commit 26905f70b7
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mainboard/google/hatch/variants/baseboard/devicetree.cb
View File

@ -200,7 +200,8 @@ chip soc/intel/cannonlake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0000"" register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad"" register "desc" = ""ELAN Touchpad""
register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_D21_IRQ)"
register "wake" = "GPE0_DW0_21"
device i2c 15 on end device i2c 15 on end
end end
end # I2C #0 end # I2C #0

14
src/mainboard/google/hatch/variants/baseboard/gpio.c
View File

@ -28,11 +28,11 @@ static const struct pad_config gpio_table[] = {
/* WWAN_RADIO_DISABLE_1V8_ODL */ /* WWAN_RADIO_DISABLE_1V8_ODL */
PAD_CFG_GPO(GPP_A19, 1, DEEP), PAD_CFG_GPO(GPP_A19, 1, DEEP),
/* /*
* TRACKPAD_INT_ODL * TRACKPAD_INT_ODL (wake)
* TODO Configure it back to invert mode, when * TODO Combine into single gpio, when ITSS IPCx configuration
* ITSS IPCx configuration is fixed in FSP. * is fixed in FSP.
*/ */
PAD_CFG_GPI_APIC(GPP_A21, NONE, PLTRST, LEVEL, NONE), PAD_CFG_GPI_SCI(GPP_A21, NONE, DEEP, EDGE_SINGLE, INVERT),
/* SRCCLKREQ1 */ /* SRCCLKREQ1 */
PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1), PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1),
/* PCIE_14_WLAN_CLKREQ_ODL */ /* PCIE_14_WLAN_CLKREQ_ODL */
@ -97,6 +97,12 @@ static const struct pad_config gpio_table[] = {
* ITSS IPCx configuration is fixed in FSP. * ITSS IPCx configuration is fixed in FSP.
*/ */
PAD_CFG_GPI_APIC(GPP_D16, NONE, DEEP, LEVEL, NONE), PAD_CFG_GPI_APIC(GPP_D16, NONE, DEEP, LEVEL, NONE),
/*
* TRACKPAD_INT_ODL
* TODO Combine into single gpio with invert mode, when ITSS
* IPCx configuration is fixed in FSP.
*/
PAD_CFG_GPI_APIC(GPP_D21, NONE, PLTRST, LEVEL, NONE),
/* SATAGP1 */ /* SATAGP1 */
PAD_CFG_NF(GPP_E1, NONE, DEEP, NF2), PAD_CFG_NF(GPP_E1, NONE, DEEP, NF2),
/* M2_SSD_PE_WAKE_ODL */ /* M2_SSD_PE_WAKE_ODL */