[coreboot-gerrit] Change in ...coreboot[master]: mb/google/hatch: Enable wake from trackpad

[Shelley Chen (Code Review)]

Shelley Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31533

Change subject: mb/google/hatch: Enable wake from trackpad
......................................................................

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 
---
M src/mainboard/google/hatch/variants/baseboard/devicetree.cb
M src/mainboard/google/hatch/variants/baseboard/gpio.c
2 files changed, 14 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/31533/1

diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
index eb528f2..690ce76 100644
--- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
@@ -195,7 +195,8 @@
    		chip drivers/i2c/generic
    			register "hid" = ""ELAN0000""
    			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
    		end
    	end # I2C #0
diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c
index b87cfa8..b459560 100644
--- a/src/mainboard/google/hatch/variants/baseboard/gpio.c
+++ b/src/mainboard/google/hatch/variants/baseboard/gpio.c
@@ -27,8 +27,12 @@
    PAD_CFG_GPO(GPP_A18, 1, DEEP),
    /* WWAN_RADIO_DISABLE_1V8_ODL */
    PAD_CFG_GPO(GPP_A19, 1, DEEP),
-	/* TRACKPAD_INT_ODL */
-	PAD_CFG_GPI_APIC(GPP_A21, NONE, PLTRST, LEVEL, INVERT),
+	/*
+	 * TRACKPAD_INT_ODL (wake)
+	 * TODO Combine into single gpio, when ITSS IPCx configuration
+	 * is fixed in FSP.
+	 */
+	PAD_CFG_GPI_SCI(GPP_A21, NONE, DEEP, EDGE_SINGLE, INVERT),
    /* SRCCLKREQ1 */
    PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1),
    /* PCIE_14_WLAN_CLKREQ_ODL */
@@ -85,6 +89,12 @@
    PAD_CFG_GPO(GPP_D15, 0, DEEP),
    /* TOUCHSCREEN_INT_L */
    PAD_CFG_GPI_APIC(GPP_D16, NONE, DEEP, LEVEL, INVERT),
+	/*
+	 * 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 */
    PAD_CFG_NF(GPP_E1, NONE, DEEP, NF2),
    /* M2_SSD_PE_WAKE_ODL */