Furquan Shaikh merged this change.
mb/google/hatch: Add INVERT to all IOAPIC pads
Now that ITSS config is fixed, we can set the IOAPIC pad configs
correctly.
BUG=b:123967687
BRANCH=None
TEST=Make sure Hatch is booting and tested out trackpad to make
sure can move cursor and wake by clicking on the trackpad
after running powerd_dbus_suspend.
Change-Id: I0b125996338b6f16e03b7ca184f6337c696a5f64
Signed-off-by: Shelley Chen <shchen@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33819
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/mainboard/google/hatch/variants/baseboard/gpio.c
M src/mainboard/google/hatch/variants/hatch/gpio.c
2 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c
index 9529cc7..a4fb4c9 100644
--- a/src/mainboard/google/hatch/variants/baseboard/gpio.c
+++ b/src/mainboard/google/hatch/variants/baseboard/gpio.c
@@ -52,8 +52,8 @@
PAD_CFG_GPO(GPP_A18, 1, DEEP),
/* A19 : WWAN_RADIO_DISABLE_1V8_ODL */
PAD_CFG_GPO(GPP_A19, 1, DEEP),
- /* A20 : M2_INT_L */
- PAD_CFG_GPI_APIC(GPP_A20, NONE, PLTRST, LEVEL, NONE),
+ /* A20 : WLAN_INT_L */
+ PAD_CFG_GPI_APIC(GPP_A20, NONE, PLTRST, LEVEL, INVERT),
/*
* A21 : TRACKPAD_INT_ODL (wake)
* TODO Combine into single gpio, when ITSS IPCx configuration
@@ -62,11 +62,8 @@
PAD_CFG_GPI_SCI(GPP_A21, NONE, DEEP, EDGE_SINGLE, INVERT),
/* A22 : FPMCU_PCH_BOOT0 */
PAD_CFG_GPO(GPP_A22, 0, DEEP),
- /* A23 : FPMCU_PCH_INT_ODL
- * TODO Configure it back to invert mode, when
- * ITSS IPCx configuration is fixed in FSP.
- */
- PAD_CFG_GPI_APIC(GPP_A23, NONE, PLTRST, LEVEL, NONE),
+ /* A23 : FPMCU_PCH_INT_ODL */
+ PAD_CFG_GPI_APIC(GPP_A23, NONE, PLTRST, LEVEL, INVERT),
/* B0 : CORE_VID0 */
PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),
@@ -143,11 +140,8 @@
PAD_CFG_GPO(GPP_C11, 1, DEEP),
/* C12 : GPP_C12 ==> NC */
PAD_NC(GPP_C12, NONE),
- /* C13 : EC_PCH_INT_L
- * TODO Configure it back to invert mode, when
- * ITSS IPCx configuration is fixed in FSP.
- */
- PAD_CFG_GPI_APIC(GPP_C13, NONE, PLTRST, LEVEL, NONE),
+ /* C13 : EC_PCH_INT_L */
+ PAD_CFG_GPI_APIC(GPP_C13, NONE, PLTRST, LEVEL, INVERT),
/* C14 : BT_DISABLE_L */
PAD_CFG_GPO(GPP_C14, 1, DEEP),
/* C15 : WWAN_DPR_SAR_ODL
@@ -166,12 +160,8 @@
PAD_CFG_NF(GPP_C19, NONE, DEEP, NF1),
/* C20 : PCH_WP_OD */
PAD_CFG_GPI(GPP_C20, NONE, DEEP),
- /*
- * C21 : H1_PCH_INT_ODL
- * TODO Configure it back to invert mode, when
- * ITSS IPCx configuration is fixed in FSP.
- */
- PAD_CFG_GPI_APIC(GPP_C21, NONE, PLTRST, LEVEL, NONE),
+ /* C21 : H1_PCH_INT_ODL */
+ PAD_CFG_GPI_APIC(GPP_C21, NONE, PLTRST, LEVEL, INVERT),
/* C22 : EC_IN_RW_OD */
PAD_CFG_GPI(GPP_C22, NONE, DEEP),
/* C23 : WLAN_PE_RST# */
@@ -451,12 +441,8 @@
PAD_CFG_NF(GPP_B18, NONE, DEEP, NF1),
/* PCH_WP_OD */
PAD_CFG_GPI(GPP_C20, NONE, DEEP),
- /*
- * C21 : H1_PCH_INT_ODL
- * TODO Configure it back to invert mode, when
- * ITSS IPCx configuration is fixed in FSP.
- */
- PAD_CFG_GPI_APIC(GPP_C21, NONE, PLTRST, LEVEL, NONE),
+ /* C21 : H1_PCH_INT_ODL */
+ PAD_CFG_GPI_APIC(GPP_C21, NONE, PLTRST, LEVEL, INVERT),
/* C23 : WLAN_PE_RST# */
PAD_CFG_GPO(GPP_C23, 1, DEEP),
/* F2 : MEM_CH_SEL */
diff --git a/src/mainboard/google/hatch/variants/hatch/gpio.c b/src/mainboard/google/hatch/variants/hatch/gpio.c
index 7e73724..f95e022 100644
--- a/src/mainboard/google/hatch/variants/hatch/gpio.c
+++ b/src/mainboard/google/hatch/variants/hatch/gpio.c
@@ -19,11 +19,8 @@
#include <commonlib/helpers.h>
static const struct pad_config gpio_table[] = {
- /* C13 : EC_PCH_INT_L
- * TODO Configure it back to invert mode, when
- * ITSS IPCx configuration is fixed in FSP.
- */
- PAD_CFG_GPI_APIC(GPP_C13, UP_20K, PLTRST, LEVEL, NONE)};
+ /* C13 : EC_PCH_INT_L */
+ PAD_CFG_GPI_APIC(GPP_C13, UP_20K, PLTRST, LEVEL, INVERT)};
const struct pad_config *override_gpio_table(size_t *num)
{
To view, visit change 33819. To unsubscribe, or for help writing mail filters, visit settings.