diff --git a/src/mainboard/system76/cml-u/gpio.h b/src/mainboard/system76/cml-u/gpio.h
index a17d6ffa52..569db0a3ea 100644
--- a/src/mainboard/system76/cml-u/gpio.h
+++ b/src/mainboard/system76/cml-u/gpio.h
@@ -90,7 +90,7 @@ static const struct pad_config gpio_table[] = {
 
 	// GSPI0
 		// TPM_PIRQ#
-		PAD_CFG_GPI_APIC_HIGH(GPP_A7, NONE, DEEP),
+		PAD_CFG_NC(GPP_A7),
 
 	// LPC
 		// PM_CLKRUN# with pull-up
diff --git a/src/mainboard/system76/lemp9/gpio.h b/src/mainboard/system76/lemp9/gpio.h
index 2a21e8b416..626d99531e 100644
--- a/src/mainboard/system76/lemp9/gpio.h
+++ b/src/mainboard/system76/lemp9/gpio.h
@@ -90,7 +90,7 @@ static const struct pad_config gpio_table[] = {
 
 	// GSPI0
 		// TPM_PIRQ#
-		PAD_CFG_GPI_APIC_HIGH(GPP_A7, NONE, DEEP),
+		PAD_CFG_NC(GPP_A7),
 
 	// LPC
 		// PM_CLKRUN# with pull-up
diff --git a/src/mainboard/system76/whl-u/gpio.h b/src/mainboard/system76/whl-u/gpio.h
index a17d6ffa52..569db0a3ea 100644
--- a/src/mainboard/system76/whl-u/gpio.h
+++ b/src/mainboard/system76/whl-u/gpio.h
@@ -90,7 +90,7 @@ static const struct pad_config gpio_table[] = {
 
 	// GSPI0
 		// TPM_PIRQ#
-		PAD_CFG_GPI_APIC_HIGH(GPP_A7, NONE, DEEP),
+		PAD_CFG_NC(GPP_A7),
 
 	// LPC
 		// PM_CLKRUN# with pull-up