diff --git a/src/mainboard/system76/rpl/variants/oryp11/gpio.c b/src/mainboard/system76/rpl/variants/oryp11/gpio.c
index 670a000687..8f79a2e077 100644
--- a/src/mainboard/system76/rpl/variants/oryp11/gpio.c
+++ b/src/mainboard/system76/rpl/variants/oryp11/gpio.c
@@ -7,7 +7,7 @@ static const struct pad_config gpio_table[] = {
 	/* ------- GPIO Group GPD ------- */
 	PAD_CFG_NF(GPD0, UP_20K, PWROK, NF1), // BATLOW_N
 	PAD_CFG_NF(GPD1, NATIVE, PWROK, NF1), // AC_PRESENT
-	PAD_CFG_GPO(GPD2, 0, DEEP), // PCH_LAKE_WAKE#
+	PAD_NC(GPD2, NONE),
 	PAD_CFG_NF(GPD3, UP_20K, PWROK, NF1), // PWR_BTN#
 	PAD_CFG_NF(GPD4, NONE, PWROK, NF1), // SUSB#_PCH
 	PAD_CFG_NF(GPD5, NONE, PWROK, NF1), // SUSC#_PCH
@@ -94,9 +94,9 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_D2, NONE),
 	PAD_CFG_GPO(GPP_D3, 0, DEEP), // GFX_DETECT_STRAP
 	PAD_NC(GPP_D4, NONE),
-	PAD_CFG_GPO(GPP_D5, 0, DEEP), // M.2_BT_PCMFRM_CRF_RST_N
-	PAD_CFG_GPO(GPP_D6, 0, DEEP), // M.2_BT_PCMOUT_CLKREQ0
-	PAD_CFG_GPO(GPP_D7, 0, DEEP), // M.2_BT_PCMIN
+	// GPP_D5 (M.2_BT_PCMFRM_CRF_RST_N) configured by FSP
+	// GPP_D6 (M.2_BT_PCMOUT_CLKREQ0) configured by FSP
+	PAD_NC(GPP_D7, NONE), // M.2_BT_PCMIN
 	PAD_NC(GPP_D8, NONE), // M.2_BT_PCMCLK
 	PAD_NC(GPP_D9, NONE),
 	PAD_NC(GPP_D10, NONE),