From 445e0668dee41d1faf180688905a744151d8b9fc Mon Sep 17 00:00:00 2001 From: Eric Lai Date: Fri, 24 Jun 2022 15:34:42 +0800 Subject: mb/google/nissa: Change pen garage wake to EV_ACT_DEASSERTED Follow google stylus spec. The Stylus-Present GPIO MUST be a wake pin that interrupts the system in active operation when the stylus is removed. After confirmed with the owner, the expect behavior is only wake when eject the pen. BUG=b:233159811 TEST=EC wake event work as expected. Signed-off-by: Eric Lai Change-Id: I7a82e5e8935c9ea27e923661f66809e9169bc86a Reviewed-on: https://review.coreboot.org/c/coreboot/+/65379 Reviewed-by: Reka Norman Tested-by: build bot (Jenkins) Reviewed-by: Frank Wu --- src/mainboard/google/brya/variants/baseboard/nissa/gpio.c | 2 +- src/mainboard/google/brya/variants/craask/overridetree.cb | 2 +- src/mainboard/google/brya/variants/nereid/overridetree.cb | 2 +- src/mainboard/google/brya/variants/nivviks/overridetree.cb | 2 +- src/mainboard/google/brya/variants/xivu/overridetree.cb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mainboard/google/brya/variants/baseboard/nissa/gpio.c b/src/mainboard/google/brya/variants/baseboard/nissa/gpio.c index 18b5d82137..4fc9c3189c 100644 --- a/src/mainboard/google/brya/variants/baseboard/nissa/gpio.c +++ b/src/mainboard/google/brya/variants/baseboard/nissa/gpio.c @@ -238,7 +238,7 @@ static const struct pad_config gpio_table[] = { /* F14 : GSXDIN ==> TCHPAD_INT_ODL */ PAD_CFG_GPI_IRQ_WAKE(GPP_F14, NONE, PWROK, LEVEL, INVERT), /* F15 : GSXSRESET# ==> SOC_PEN_DETECT_ODL */ - PAD_CFG_GPI_SCI_HIGH_LOCK(GPP_F15, NONE, EDGE_BOTH, LOCK_CONFIG), + PAD_CFG_GPI_SCI_HIGH_LOCK(GPP_F15, NONE, EDGE_SINGLE, LOCK_CONFIG), /* F16 : NC */ PAD_NC_LOCK(GPP_F16, NONE, LOCK_CONFIG), /* F17 : THC1_SPI2_RST# ==> EC_SOC_WAKE_ODL */ diff --git a/src/mainboard/google/brya/variants/craask/overridetree.cb b/src/mainboard/google/brya/variants/craask/overridetree.cb index 4091b17b2e..8945d562f8 100644 --- a/src/mainboard/google/brya/variants/craask/overridetree.cb +++ b/src/mainboard/google/brya/variants/craask/overridetree.cb @@ -98,7 +98,7 @@ chip soc/intel/alderlake register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_F13)" register "key.wake_gpe" = "GPE0_DW2_15" register "key.wakeup_route" = "WAKEUP_ROUTE_SCI" - register "key.wakeup_event_action" = "EV_ACT_ANY" + register "key.wakeup_event_action" = "EV_ACT_DEASSERTED" register "key.dev_name" = ""EJCT"" register "key.linux_code" = "SW_PEN_INSERTED" register "key.linux_input_type" = "EV_SW" diff --git a/src/mainboard/google/brya/variants/nereid/overridetree.cb b/src/mainboard/google/brya/variants/nereid/overridetree.cb index c30da2d8f3..3cc7dc37a2 100644 --- a/src/mainboard/google/brya/variants/nereid/overridetree.cb +++ b/src/mainboard/google/brya/variants/nereid/overridetree.cb @@ -162,7 +162,7 @@ chip soc/intel/alderlake register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_F13)" register "key.wake_gpe" = "GPE0_DW2_15" register "key.wakeup_route" = "WAKEUP_ROUTE_SCI" - register "key.wakeup_event_action" = "EV_ACT_ANY" + register "key.wakeup_event_action" = "EV_ACT_DEASSERTED" register "key.dev_name" = ""EJCT"" register "key.linux_code" = "SW_PEN_INSERTED" register "key.linux_input_type" = "EV_SW" diff --git a/src/mainboard/google/brya/variants/nivviks/overridetree.cb b/src/mainboard/google/brya/variants/nivviks/overridetree.cb index 267cf45c20..2188823fc5 100644 --- a/src/mainboard/google/brya/variants/nivviks/overridetree.cb +++ b/src/mainboard/google/brya/variants/nivviks/overridetree.cb @@ -199,7 +199,7 @@ chip soc/intel/alderlake register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_F13)" register "key.wake_gpe" = "GPE0_DW2_15" register "key.wakeup_route" = "WAKEUP_ROUTE_SCI" - register "key.wakeup_event_action" = "EV_ACT_ANY" + register "key.wakeup_event_action" = "EV_ACT_DEASSERTED" register "key.dev_name" = ""EJCT"" register "key.linux_code" = "SW_PEN_INSERTED" register "key.linux_input_type" = "EV_SW" diff --git a/src/mainboard/google/brya/variants/xivu/overridetree.cb b/src/mainboard/google/brya/variants/xivu/overridetree.cb index 3dc5fa7651..3f36594a5b 100644 --- a/src/mainboard/google/brya/variants/xivu/overridetree.cb +++ b/src/mainboard/google/brya/variants/xivu/overridetree.cb @@ -67,7 +67,7 @@ chip soc/intel/alderlake register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_F13)" register "key.wake_gpe" = "GPE0_DW2_15" register "key.wakeup_route" = "WAKEUP_ROUTE_SCI" - register "key.wakeup_event_action" = "EV_ACT_ANY" + register "key.wakeup_event_action" = "EV_ACT_DEASSERTED" register "key.dev_name" = ""EJCT"" register "key.linux_code" = "SW_PEN_INSERTED" register "key.linux_input_type" = "EV_SW" -- cgit v1.2.3