aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeunghwan Kim <sh_.kim@samsung.corp-partner.google.com>2023-08-21 14:23:15 +0900
committerFelix Held <felix-coreboot@felixheld.de>2023-09-05 12:25:46 +0000
commiteba8952de13987ee070f914b2e84ffa97f414d7e (patch)
treea8f3e72fe5cee23368bbe4056412098450293158
parent69f0289608c983ba187e4dc479fbdd27855cbab2 (diff)
mb/google/nissa/var/pirrha: Use GpioInt instead of GPE for digitizer pen
Currently pirrha's digitizer pen uses GPP_F12 for I2C HID interrupt signal. But its IRQ number is the same as GPD2, which is used as EC_SYNC_IRQ. It caused EC driver loading error from dmesg: cros_ec_lpcs GOOG0004:00: Failed to request IRQ 98: -16 cros_ec_lpcs GOOG0004:00: couldn't register ec_dev (-16) cros_ec_lpcs: probe of GOOG0004:00 failed with error -16 So change the digitizer pen interrupt type to GpioInt to prevent the conflict. BUG=b:292134655 TEST=Verified EC driver reported no error and pen device worked Change-Id: Ieb88e87fcfb06544a4b5b5133b752aa821fab76a Signed-off-by: Seunghwan Kim <sh_.kim@samsung.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/77346 Reviewed-by: Paul Menzel <paulepanter@mailbox.org> Reviewed-by: Martin L Roth <gaumless@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/google/brya/variants/pirrha/gpio.c2
-rw-r--r--src/mainboard/google/brya/variants/pirrha/overridetree.cb2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mainboard/google/brya/variants/pirrha/gpio.c b/src/mainboard/google/brya/variants/pirrha/gpio.c
index d0a114fe3c..431b613c0a 100644
--- a/src/mainboard/google/brya/variants/pirrha/gpio.c
+++ b/src/mainboard/google/brya/variants/pirrha/gpio.c
@@ -36,7 +36,7 @@ static const struct pad_config override_gpio_table[] = {
/* F6 : NC */
PAD_NC(GPP_F6, NONE),
/* F12 : GSXDOUT ==> EMR_INT_ODL */
- PAD_CFG_GPI_APIC(GPP_F12, NONE, PLTRST, LEVEL, INVERT),
+ PAD_CFG_GPI_INT(GPP_F12, NONE, PLTRST, LEVEL),
/* F13 : SOC_PEN_DETECT_R_ODL ==> NC */
PAD_NC(GPP_F13, NONE),
/* F15 : SOC_PEN_DETECT_OEL ==> NC */
diff --git a/src/mainboard/google/brya/variants/pirrha/overridetree.cb b/src/mainboard/google/brya/variants/pirrha/overridetree.cb
index 50f37ba188..62b5a0a60c 100644
--- a/src/mainboard/google/brya/variants/pirrha/overridetree.cb
+++ b/src/mainboard/google/brya/variants/pirrha/overridetree.cb
@@ -391,7 +391,7 @@ chip soc/intel/alderlake
chip drivers/i2c/hid
register "generic.hid" = ""WCOM014B""
register "generic.desc" = ""WCOM Digitizer""
- register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F12_IRQ)"
+ register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_F12)"
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_C0)"
register "generic.enable_delay_ms" = "20"
register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_F16)"