[S] Change in coreboot[main]: Revert "mb/google/brya/var/xol: Change touchpad I2C interrupt type to...

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/84058?usp=email )

Change subject: Revert "mb/google/brya/var/xol: Change touchpad I2C interrupt type to GPIO_INT"
......................................................................

Revert "mb/google/brya/var/xol: Change touchpad I2C interrupt type to GPIO_INT"

This reverts commit aa6865291a7ddfae4c67fcfc55ebd0c13a376807.

Reason for revert: We applied this patch for touchpad stuttering issue
for XOl, but the same touchpad problem was reported. So we would revert
this change and apply kernel patch (crrev/c/5808335) to avoid the
touchpad issue.

Change-Id: I78139932e76dbd4128fb325dd70b7dcff3bcc81c
Signed-off-by: Seunghwan Kim 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84058
Tested-by: build bot (Jenkins) 
Reviewed-by: Subrata Banik 
---
M src/mainboard/google/brya/variants/xol/gpio.c
M src/mainboard/google/brya/variants/xol/overridetree.cb
2 files changed, 2 insertions(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Subrata Banik: Looks good to me, approved

diff --git a/src/mainboard/google/brya/variants/xol/gpio.c b/src/mainboard/google/brya/variants/xol/gpio.c
index 9e49784..39478a1 100644
--- a/src/mainboard/google/brya/variants/xol/gpio.c
+++ b/src/mainboard/google/brya/variants/xol/gpio.c
@@ -119,13 +119,6 @@
    PAD_NC(GPP_F12, NONE),
    /* F13 : GSXDOUT ==> NC */
    PAD_NC(GPP_F13, NONE),
-	/* F14 : GSXDIN ==> TCHPAD_INT_ODL */
-	/*
-	 * FIXME: Change back the interrupt type to IRQxAPIC if possible after investigating
-	 *        the reason why Xol shows touchpad stuttering issue with IRQxAPIC
-	 *        configuration but not GPI_INT.
-	 */
-	PAD_CFG_GPI_INT(GPP_F14, NONE, PWROK, LEVEL),
    /* F15 : GSXSRESET# ==> PU 100K 3.3V */
    PAD_CFG_GPI(GPP_F15, NONE, DEEP),
    /* F16 : GSXCLK ==> NC */
diff --git a/src/mainboard/google/brya/variants/xol/overridetree.cb b/src/mainboard/google/brya/variants/xol/overridetree.cb
index 529cb37..914940b 100644
--- a/src/mainboard/google/brya/variants/xol/overridetree.cb
+++ b/src/mainboard/google/brya/variants/xol/overridetree.cb
@@ -341,11 +341,8 @@
    		chip drivers/i2c/hid
    			register "generic.hid" = ""ZNT0000""
    			register "generic.desc" = ""Zinitix Touchpad""
-				# FIXME: Change back the interrupt type to IRQxAPIC if possible
-				#        after investigating the reason why Xol shows touchpad
-				#        stuttering issue with IRQxAPIC configuration but not
-				#        GPI_INT.
-				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPP_F14)"
+				register "generic.irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_F14_IRQ)"
+				register "generic.wake" = "GPE0_DW2_14"
    			register "generic.detect" = "1"
    			register "hid_desc_reg_offset" = "0xE"
    			device i2c 40 on end