diff --git a/src/mainboard/google/cyan/variants/banon/gpio.c b/src/mainboard/google/cyan/variants/banon/gpio.c
index f9e4e3e362..6983d91169 100644
--- a/src/mainboard/google/cyan/variants/banon/gpio.c
+++ b/src/mainboard/google/cyan/variants/banon/gpio.c
@@ -163,7 +163,7 @@ static const struct soc_gpio_map  gpn_gpio_map[] = {
 	/* 17 GPIO_SUS3 */
 	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
 	/* 18 GPIO_SUS7 */
-	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
+	GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),
 	/* 19 GPIO_SUS1 */
 	GPIO_NC, /* 20 GPIO_SUS5 */
 	GPIO_NC, /* 21 SEC_GPIO_SUS11 */
diff --git a/src/mainboard/google/cyan/variants/celes/gpio.c b/src/mainboard/google/cyan/variants/celes/gpio.c
index b4d8b1e280..c416053dae 100644
--- a/src/mainboard/google/cyan/variants/celes/gpio.c
+++ b/src/mainboard/google/cyan/variants/celes/gpio.c
@@ -164,7 +164,7 @@ static const struct soc_gpio_map  gpn_gpio_map[] = {
 	GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
 	GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),
 	/* 17 GPIO_SUS3 */
-	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
+	GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),
 	/* 18 GPIO_SUS7 */
 	GPIO_NC,
 	/* 19 GPIO_SUS1 */
diff --git a/src/mainboard/google/cyan/variants/cyan/gpio.c b/src/mainboard/google/cyan/variants/cyan/gpio.c
index 4cdfcdf18c..c26e7b69fb 100644
--- a/src/mainboard/google/cyan/variants/cyan/gpio.c
+++ b/src/mainboard/google/cyan/variants/cyan/gpio.c
@@ -166,7 +166,7 @@ static const struct soc_gpio_map  gpn_gpio_map[] = {
 	/* 17 GPIO_SUS3 */
 	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
 	/* 18 GPIO_SUS7 */
-	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
+	GPI(trig_level_low, L3, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),
 	/* 19 GPIO_SUS1 */
 	GPIO_NC, /* 20 GPIO_SUS5 */
 	GPIO_NC, /* 21 SEC_GPIO_SUS11 */
diff --git a/src/mainboard/google/cyan/variants/kefka/gpio.c b/src/mainboard/google/cyan/variants/kefka/gpio.c
index d628658228..0ef284282e 100644
--- a/src/mainboard/google/cyan/variants/kefka/gpio.c
+++ b/src/mainboard/google/cyan/variants/kefka/gpio.c
@@ -163,7 +163,7 @@ static const struct soc_gpio_map  gpn_gpio_map[] = {
 	/* 17 GPIO_SUS3 */
 	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
 	/* 18 GPIO_SUS7 */
-	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
+	GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),
 	/* 19 GPIO_SUS1 */
 	GPIO_NC, /* 20 GPIO_SUS5 */
 	GPIO_NC, /* 21 SEC_GPIO_SUS11 */
diff --git a/src/mainboard/google/cyan/variants/reks/gpio.c b/src/mainboard/google/cyan/variants/reks/gpio.c
index 7b9b5af83d..e0d82cf039 100644
--- a/src/mainboard/google/cyan/variants/reks/gpio.c
+++ b/src/mainboard/google/cyan/variants/reks/gpio.c
@@ -165,7 +165,7 @@ static const struct soc_gpio_map  gpn_gpio_map[] = {
 	/* 17 GPIO_SUS3 */
 	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
 	/* 18 GPIO_SUS7 */
-	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
+	GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),
 	/* 19 GPIO_SUS1 */
 	GPIO_NC, /* 20 GPIO_SUS5 */
 	GPIO_NC, /* 21 SEC_GPIO_SUS11 */
diff --git a/src/mainboard/google/cyan/variants/relm/gpio.c b/src/mainboard/google/cyan/variants/relm/gpio.c
index 95c130073a..9cb80e6277 100644
--- a/src/mainboard/google/cyan/variants/relm/gpio.c
+++ b/src/mainboard/google/cyan/variants/relm/gpio.c
@@ -166,7 +166,7 @@ static const struct soc_gpio_map  gpn_gpio_map[] = {
 	/* 17 GPIO_SUS3 */
 	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
 	/* 18 GPIO_SUS7 */
-	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
+	GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),
 	/* 19 GPIO_SUS1 */
 	GPIO_NC, /* 20 GPIO_SUS5 */
 	GPIO_NC, /* 21 SEC_GPIO_SUS11 */
diff --git a/src/mainboard/google/cyan/variants/setzer/gpio.c b/src/mainboard/google/cyan/variants/setzer/gpio.c
index 1307f7ded6..83f742e5d8 100644
--- a/src/mainboard/google/cyan/variants/setzer/gpio.c
+++ b/src/mainboard/google/cyan/variants/setzer/gpio.c
@@ -164,7 +164,7 @@ static const struct soc_gpio_map  gpn_gpio_map[] = {
 	/* 17 GPIO_SUS3 */
 	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
 	/* 18 GPIO_SUS7 */
-	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
+	GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),
 	/* 19 GPIO_SUS1 */
 	GPIO_NC, /* 20 GPIO_SUS5 */
 	GPIO_NC, /* 21 SEC_GPIO_SUS11 */
diff --git a/src/mainboard/google/cyan/variants/ultima/gpio.c b/src/mainboard/google/cyan/variants/ultima/gpio.c
index 43f1099a54..fe8c934b7d 100644
--- a/src/mainboard/google/cyan/variants/ultima/gpio.c
+++ b/src/mainboard/google/cyan/variants/ultima/gpio.c
@@ -165,7 +165,7 @@ static const struct soc_gpio_map  gpn_gpio_map[] = {
 	/* 17 GPIO_SUS3 */
 	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
 	/* 18 GPIO_SUS7 */
-	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
+	GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),
 	/* 19 GPIO_SUS1 */
 	GPIO_NC, /* 20 GPIO_SUS5 */
 	GPIO_NC, /* 21 SEC_GPIO_SUS11 */
diff --git a/src/mainboard/google/cyan/variants/wizpig/gpio.c b/src/mainboard/google/cyan/variants/wizpig/gpio.c
index 3d3b27359e..affe8932d4 100644
--- a/src/mainboard/google/cyan/variants/wizpig/gpio.c
+++ b/src/mainboard/google/cyan/variants/wizpig/gpio.c
@@ -164,7 +164,7 @@ static const struct soc_gpio_map  gpn_gpio_map[] = {
 	/* 17 GPIO_SUS3 */
 	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
 	/* 18 GPIO_SUS7 */
-	GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),
+	GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),
 	/* 19 GPIO_SUS1 */
 	GPIO_NC, /* 20 GPIO_SUS5 */
 	GPIO_INPUT_NO_PULL, /* 21 SEC_GPIO_SUS11 */