summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaul E Rangel <rrangel@chromium.org>2021-04-30 09:58:18 -0600
committerRaul Rangel <rrangel@chromium.org>2021-05-05 15:31:07 +0000
commit3cb69c23977b5fc23105bb1bcb8f1a8336fbe466 (patch)
tree10fcf130697b16838df68e8f936ce6a7fe74f482
parent0f068a600ebca71d5bf175ad70115ffbd679b3c3 (diff)
mb/google/guybrush: Fix S0i3/S3 GPIO configuration
Using PAD_WAKE is actually wrong. The wake bits are only supposed to be set when using the GPIO controller to wake the system. coreboot's current architecture relies on using GPEs to wake the system. BUG=b:186011392 TEST=Wake system from S0i3 with EC and see GPE 3 increment. Signed-off-by: Raul E Rangel <rrangel@chromium.org> Change-Id: If7f9d2c13503c01fb9d834c436dac723f2c3b24c Reviewed-on: https://review.coreboot.org/c/coreboot/+/52801 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
-rw-r--r--src/mainboard/google/guybrush/variants/baseboard/gpio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mainboard/google/guybrush/variants/baseboard/gpio.c b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
index 528ace1653..336fd621da 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/gpio.c
+++ b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
@@ -27,7 +27,7 @@ static const struct soc_amd_gpio base_gpio_table[] = {
/* EN_PWR_WWAN_X */
PAD_GPO(GPIO_8, HIGH),
/* SOC_TCHPAD_INT_ODL */
- PAD_INT(GPIO_9, PULL_NONE, EDGE_HIGH, STATUS_DELIVERY),
+ PAD_SCI(GPIO_9, PULL_NONE, EDGE_HIGH),
/* S0A3 */
PAD_NF(GPIO_10, S0A3, PULL_NONE),
/* SOC_FP_RST_L */
@@ -38,7 +38,7 @@ static const struct soc_amd_gpio base_gpio_table[] = {
/* USB_OC0_L */
PAD_NF(GPIO_16, USB_OC0_L, PULL_NONE),
/* SOC_SAR_INT_L */
- PAD_INT(GPIO_17, PULL_NONE, EDGE_LOW, STATUS_DELIVERY),
+ PAD_SCI(GPIO_17, PULL_NONE, EDGE_LOW),
/* WWAN_AUX_RESET_L */
PAD_GPO(GPIO_18, LOW),
/* I2C3_SCL */
@@ -46,9 +46,9 @@ static const struct soc_amd_gpio base_gpio_table[] = {
/* I2C3_SDA */
PAD_NF(GPIO_20, I2C3_SDA, PULL_NONE),
/* SOC_FP_INT_L */
- PAD_INT(GPIO_21, PULL_NONE, EDGE_LOW, STATUS_DELIVERY),
+ PAD_SCI(GPIO_21, PULL_NONE, EDGE_LOW),
/* EC_SOC_WAKE_ODL */
- PAD_WAKE(GPIO_22, PULL_NONE, EDGE_LOW, S0i3),
+ PAD_SCI(GPIO_22, PULL_NONE, EDGE_LOW),
/* AC_PRES */
PAD_NF(GPIO_23, AC_PRES, PULL_UP),
/* WWAN_RST_L */