aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/amd/mandolin/variants/mandolin/gpio.c2
-rw-r--r--src/mainboard/amd/padmelon/gpio.c4
-rw-r--r--src/mainboard/google/guybrush/variants/baseboard/gpio.c2
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/gpio.c2
-rw-r--r--src/mainboard/google/mancomb/variants/baseboard/gpio.c2
-rw-r--r--src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c2
-rw-r--r--src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c2
7 files changed, 9 insertions, 7 deletions
diff --git a/src/mainboard/amd/mandolin/variants/mandolin/gpio.c b/src/mainboard/amd/mandolin/variants/mandolin/gpio.c
index 5270fd9610..0647319161 100644
--- a/src/mainboard/amd/mandolin/variants/mandolin/gpio.c
+++ b/src/mainboard/amd/mandolin/variants/mandolin/gpio.c
@@ -9,6 +9,8 @@
* ramstage.
*/
static const struct soc_amd_gpio gpio_set_stage_ram[] = {
+ /* GPIO_2 - WLAN_PCIE_WAKE_3V3_ODL, SCI */
+ PAD_NF_SCI(GPIO_2, WAKE_L, PULL_UP, EDGE_LOW),
/* SSD DEVSLP */
PAD_NF(GPIO_5, DEVSLP0, PULL_NONE),
/* Defeature SATA Express DEVSLP, as some boards are reworked
diff --git a/src/mainboard/amd/padmelon/gpio.c b/src/mainboard/amd/padmelon/gpio.c
index 228da50b3b..9c18d30a23 100644
--- a/src/mainboard/amd/padmelon/gpio.c
+++ b/src/mainboard/amd/padmelon/gpio.c
@@ -28,8 +28,8 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
/* WLAND */
PAD_WAKE(GPIO_137, PULL_UP, LEVEL_LOW, S3),
#else
- /* PCIE_WAKE */
- PAD_GPI(GPIO_2, PULL_DOWN),
+ /* PCIE_WAKE, SCI */
+ PAD_NF_SCI(GPIO_2, WAKE_L, PULL_UP, EDGE_LOW),
/* DEVSLP1 - default as GPIO, do not program */
/* WLAND - default as GPIO, do not program */
diff --git a/src/mainboard/google/guybrush/variants/baseboard/gpio.c b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
index 4f04c08d98..c43548c972 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/gpio.c
+++ b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
@@ -12,7 +12,7 @@ static const struct soc_amd_gpio base_gpio_table[] = {
/* SYS_RESET_L */
PAD_NF(GPIO_1, SYS_RESET_L, PULL_NONE),
/* WAKE_L */
- PAD_NF(GPIO_2, WAKE_L, PULL_NONE),
+ PAD_NF_SCI(GPIO_2, WAKE_L, PULL_NONE, EDGE_LOW),
/* GSC_SOC_INT_L */
PAD_INT(GPIO_3, PULL_NONE, EDGE_LOW, STATUS_DELIVERY),
/* SOC_PEN_DETECT_ODL */
diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
index f2848f9f29..3acf70f458 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c
+++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
@@ -81,7 +81,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
PAD_NF(GPIO_1, SYS_RESET_L, PULL_UP),
/* GPIO_2 - WLAN_PCIE_WAKE_3V3_ODL */
- PAD_NF(GPIO_2, WAKE_L, PULL_UP),
+ PAD_NF_SCI(GPIO_2, WAKE_L, PULL_UP, EDGE_LOW),
/* GPIO_3 - MEM_VOLT_SEL */
PAD_GPI(GPIO_3, PULL_UP),
diff --git a/src/mainboard/google/mancomb/variants/baseboard/gpio.c b/src/mainboard/google/mancomb/variants/baseboard/gpio.c
index 29fa8660db..bcca693c51 100644
--- a/src/mainboard/google/mancomb/variants/baseboard/gpio.c
+++ b/src/mainboard/google/mancomb/variants/baseboard/gpio.c
@@ -12,7 +12,7 @@ static const struct soc_amd_gpio base_gpio_table[] = {
/* SYS_RESET_L */
PAD_NF(GPIO_1, SYS_RESET_L, PULL_NONE),
/* WAKE_L */
- PAD_NF(GPIO_2, WAKE_L, PULL_NONE),
+ PAD_NF_SCI(GPIO_2, WAKE_L, PULL_NONE, EDGE_LOW),
/* GSC_SOC_INT_L */
PAD_INT(GPIO_3, PULL_NONE, EDGE_LOW, STATUS_DELIVERY),
/* AGPIO4 */
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
index 473ffb10cb..42d0f90199 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
@@ -14,7 +14,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
/* SYS_RESET_L */
PAD_NF(GPIO_1, SYS_RESET_L, PULL_NONE),
/* WIFI_PCIE_WAKE_ODL */
- PAD_SCI(GPIO_2, PULL_NONE, EDGE_LOW),
+ PAD_NF_SCI(GPIO_2, WAKE_L, PULL_NONE, EDGE_LOW),
/* H1_FCH_INT_ODL */
PAD_INT(GPIO_3, PULL_NONE, EDGE_LOW, STATUS_DELIVERY),
/* PEN_DETECT_ODL */
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
index 341357e8cd..bf9833bf4b 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
@@ -16,7 +16,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
/* SYS_RESET_L */
PAD_NF(GPIO_1, SYS_RESET_L, PULL_NONE),
/* WIFI_PCIE_WAKE_ODL */
- PAD_SCI(GPIO_2, PULL_NONE, EDGE_LOW),
+ PAD_NF_SCI(GPIO_2, WAKE_L, PULL_NONE, EDGE_LOW),
/* H1_FCH_INT_ODL */
PAD_INT(GPIO_3, PULL_NONE, EDGE_LOW, STATUS_DELIVERY),
/* PEN_DETECT_ODL */