diff --git a/src/mainboard/system76/adl-p/variants/darp8/gpio.c b/src/mainboard/system76/adl-p/variants/darp8/gpio.c
index 2e8b0161b4..fbc1eada40 100644
--- a/src/mainboard/system76/adl-p/variants/darp8/gpio.c
+++ b/src/mainboard/system76/adl-p/variants/darp8/gpio.c
@@ -137,8 +137,8 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_E15, NONE),
 	PAD_CFG_GPI(GPP_E16, NONE, DEEP), // SDCARD_WAKE#
 	PAD_NC(GPP_E17, NONE),
-	PAD_NC(GPP_E18, NATIVE), // TBT_LSX0_TXD
-	PAD_NC(GPP_E19, NATIVE), // TBT_LSX0_RXD
+	//PAD_NC(GPP_E18, NATIVE), // TBT_LSX0_TXD
+	//PAD_NC(GPP_E19, NATIVE), // TBT_LSX0_RXD
 	PAD_NC(GPP_E20, NONE),
 	PAD_NC(GPP_E21, NONE), // TBT LSX #1 PINS VCCIO CONFIGURATION strap
 	PAD_NC(GPP_E22, NONE),
diff --git a/src/mainboard/system76/adl-p/variants/galp6/gpio.c b/src/mainboard/system76/adl-p/variants/galp6/gpio.c
index ebec8696c4..494c91aa1b 100644
--- a/src/mainboard/system76/adl-p/variants/galp6/gpio.c
+++ b/src/mainboard/system76/adl-p/variants/galp6/gpio.c
@@ -137,8 +137,8 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_E15, NONE),
 	PAD_NC(GPP_E16, NONE),
 	PAD_CFG_GPI(GPP_E17, NONE, DEEP), // BOARD_ID5
-	PAD_NC(GPP_E18, NATIVE), // TBT_LSX0_TXD
-	PAD_NC(GPP_E19, NATIVE), // TBT_LSX0_RXD
+	//PAD_NC(GPP_E18, NATIVE), // TBT_LSX0_TXD
+	//PAD_NC(GPP_E19, NATIVE), // TBT_LSX0_RXD
 	PAD_NC(GPP_E20, NONE),
 	PAD_NC(GPP_E21, NONE), // TBT LSX #1 PINS VCCIO CONFIGURATION strap
 	PAD_NC(GPP_E22, NONE),
diff --git a/src/mainboard/system76/adl-p/variants/lemp11/gpio.c b/src/mainboard/system76/adl-p/variants/lemp11/gpio.c
index cda39b78af..0a0eabadd5 100644
--- a/src/mainboard/system76/adl-p/variants/lemp11/gpio.c
+++ b/src/mainboard/system76/adl-p/variants/lemp11/gpio.c
@@ -137,8 +137,8 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_E15, NONE),
 	PAD_NC(GPP_E16, NONE),
 	PAD_NC(GPP_E17, NONE),
-	PAD_NC(GPP_E18, NATIVE), // TBT_LSX0_TXD
-	PAD_NC(GPP_E19, NATIVE), // TBT_LSX0_RXD
+	//PAD_NC(GPP_E18, NATIVE), // TBT_LSX0_TXD
+	//PAD_NC(GPP_E19, NATIVE), // TBT_LSX0_RXD
 	PAD_NC(GPP_E20, NONE),
 	PAD_NC(GPP_E21, NONE),
 	PAD_NC(GPP_E22, NONE),
diff --git a/src/mainboard/system76/adl-p/variants/oryp10/gpio.c b/src/mainboard/system76/adl-p/variants/oryp10/gpio.c
index ea55fa3a22..4f281baf5d 100644
--- a/src/mainboard/system76/adl-p/variants/oryp10/gpio.c
+++ b/src/mainboard/system76/adl-p/variants/oryp10/gpio.c
@@ -137,8 +137,8 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_E15, NONE),
 	PAD_NC(GPP_E16, NONE),
 	PAD_CFG_GPI(GPP_E17, NONE, DEEP), // BOARD_ID5
-	PAD_NC(GPP_E18, NATIVE), // TBTA_LSX2_TXD
-	PAD_NC(GPP_E19, NATIVE), // TBTA_LSX2_RXD
+	//PAD_NC(GPP_E18, NATIVE), // TBTA_LSX2_TXD
+	//PAD_NC(GPP_E19, NATIVE), // TBTA_LSX2_RXD
 	PAD_NC(GPP_E20, NONE),
 	PAD_NC(GPP_E21, NONE), // Strap
 	PAD_NC(GPP_E22, NONE),
diff --git a/src/mainboard/system76/adl-p/variants/oryp9/gpio.c b/src/mainboard/system76/adl-p/variants/oryp9/gpio.c
index ea55fa3a22..4f281baf5d 100644
--- a/src/mainboard/system76/adl-p/variants/oryp9/gpio.c
+++ b/src/mainboard/system76/adl-p/variants/oryp9/gpio.c
@@ -137,8 +137,8 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_E15, NONE),
 	PAD_NC(GPP_E16, NONE),
 	PAD_CFG_GPI(GPP_E17, NONE, DEEP), // BOARD_ID5
-	PAD_NC(GPP_E18, NATIVE), // TBTA_LSX2_TXD
-	PAD_NC(GPP_E19, NATIVE), // TBTA_LSX2_RXD
+	//PAD_NC(GPP_E18, NATIVE), // TBTA_LSX2_TXD
+	//PAD_NC(GPP_E19, NATIVE), // TBTA_LSX2_RXD
 	PAD_NC(GPP_E20, NONE),
 	PAD_NC(GPP_E21, NONE), // Strap
 	PAD_NC(GPP_E22, NONE),