diff --git a/src/mainboard/google/brya/variants/yavilla/fw_config.c b/src/mainboard/google/brya/variants/yavilla/fw_config.c
index 7231885d2a..0f08a43b83 100644
--- a/src/mainboard/google/brya/variants/yavilla/fw_config.c
+++ b/src/mainboard/google/brya/variants/yavilla/fw_config.c
@@ -66,6 +66,11 @@ static const struct pad_config stylus_disable_pads[] = {
 	PAD_NC_LOCK(GPP_F15, NONE, LOCK_CONFIG),
 };
 
+static const struct pad_config disable_wifi_pch_susclk[] = {
+	/* GPD8 ==> NC */
+	PAD_NC(GPD8, NONE),
+};
+
 void fw_config_gpio_padbased_override(struct pad_config *padbased_table)
 {
 	if (!fw_config_probe(FW_CONFIG(DB_USB, DB_1C_LTE))) {
@@ -88,5 +93,9 @@ void fw_config_gpio_padbased_override(struct pad_config *padbased_table)
 		gpio_padbased_override(padbased_table, stylus_disable_pads,
 				       ARRAY_SIZE(stylus_disable_pads));
 	}
-
+	if (fw_config_probe(FW_CONFIG(WIFI_SAR_ID, SAR_ID_3))) {
+		printk(BIOS_INFO, "Disable PCH SUSCLK.\n");
+		gpio_padbased_override(padbased_table, disable_wifi_pch_susclk,
+					ARRAY_SIZE(disable_wifi_pch_susclk));
+	}
 }
diff --git a/src/mainboard/google/brya/variants/yavilla/overridetree.cb b/src/mainboard/google/brya/variants/yavilla/overridetree.cb
index 86e784e42d..6d2b47f918 100644
--- a/src/mainboard/google/brya/variants/yavilla/overridetree.cb
+++ b/src/mainboard/google/brya/variants/yavilla/overridetree.cb
@@ -7,6 +7,9 @@ fw_config
 	end
 	field WIFI_SAR_ID 2 3
 		option SAR_ID_0			0
+		option SAR_ID_1			1
+		option SAR_ID_2			2
+		option SAR_ID_3			3
 	end
 	field STYLUS 9
 		option STYLUS_ABSENT		0