diff --git a/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c b/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c
index ba3b233eaa..a7a7fdf132 100644
--- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c
+++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c
@@ -63,6 +63,13 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_R3, NATIVE, DEEP, NF1),				/* Data Input */
 	PAD_CFG_NF(GPP_R4, NATIVE, DEEP, NF1),				/* Reset */
 
+	/* PCH */
+	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),				/* C10 Gate */
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),				/* Platform Reset */
+	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),				/* Vendor ID 0 */
+	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),				/* Vendor ID 1 */
+	PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),	/* Processor Hot */
+
 	/* GPD2:	LAN Wake					*/
 	PAD_NC(GPD2, NONE),
 	/* GPD6:	Sleep A						*/
@@ -106,12 +113,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_A23, NONE),
 
 
-	/* B0:		Core Vendor ID 0				*/
-	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),
-	/* B1:		Core Vendor ID 1				*/
-	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),
-	/* B2:		BC PROCHOT					*/
-	PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),
 	/* B3:		Not Connected					*/
 	PAD_NC(GPP_B3, NONE),
 	/* B4:		Not Connected					*/
@@ -132,8 +133,6 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_B11, NONE, DEEP, NF1),
 	/* B12:		PM SLP S0					*/
 	PAD_NC(GPP_B12, NONE),
-	/* B13:		PLT RST						*/
-	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
 	/* B14:		Top Swap Override	Weak Internal PD 20K
 				High:	Enabled
 				Low:	Disabled			*/
@@ -365,8 +364,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_H14, NONE),
 	/* H16:		Not Connected					*/
 	PAD_NC(GPP_H16, NONE),
-	/* H18:		CPI C10 Gate					*/
-	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),
 	/* H19:		Clock Request 4					*/
 	PAD_NC(GPP_H19, NONE),
 	/* H20:		Not Connected					*/
diff --git a/src/mainboard/starlabs/starbook/variants/adl/gpio.c b/src/mainboard/starlabs/starbook/variants/adl/gpio.c
index 58fd8d8dc6..da27f69bd4 100644
--- a/src/mainboard/starlabs/starbook/variants/adl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/adl/gpio.c
@@ -64,6 +64,13 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_R3, NATIVE, DEEP, NF1),				/* Data Input */
 	PAD_CFG_NF(GPP_R4, NATIVE, DEEP, NF1),				/* Reset */
 
+	/* PCH */
+	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),				/* C10 Gate */
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),				/* Platform Reset */
+	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),				/* Vendor ID 0 */
+	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),				/* Vendor ID 1 */
+	PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),	/* Processor Hot */
+
 	/* GPD2:	LAN Wake					*/
 	PAD_NC(GPD2, NONE),
 	/* GPD6:	Sleep A						*/
@@ -106,12 +113,6 @@ const struct pad_config gpio_table[] = {
 	/* A23:		Not Connected					*/
 	PAD_NC(GPP_A23, NONE),
 
-	/* B0:		Core Vendor ID 0				*/
-	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),
-	/* B1:		Core Vendor ID 1				*/
-	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),
-	/* B2:		BC PROCHOT					*/
-	PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),
 	/* B3:		Not Connected					*/
 	PAD_NC(GPP_B3, NONE),
 	/* B4:		Not Connected					*/
@@ -132,8 +133,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_B11, NONE),
 	/* B12:		PM SLP S0					*/
 	PAD_NC(GPP_B12, NONE),
-	/* B13:		PLT RST						*/
-	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
 	/* B14:		Top Swap Override	Weak Internal PD 20K
 				High:	Enabled
 				Low:	Disabled			*/
@@ -367,8 +366,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_H14, NONE),
 	/* H16:		Not Connected					*/
 	PAD_NC(GPP_H16, NONE),
-	/* H18:		CPI C10 Gate					*/
-	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),
 	/* H19:		Clock Request 4		CPU M.2 SSD		*/
 	PAD_NC(GPP_H19, NONE),
 	/* H20:		Not Connected					*/
diff --git a/src/mainboard/starlabs/starbook/variants/cml/gpio.c b/src/mainboard/starlabs/starbook/variants/cml/gpio.c
index 4159f258a6..e916a9ff42 100644
--- a/src/mainboard/starlabs/starbook/variants/cml/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/cml/gpio.c
@@ -59,6 +59,10 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_E19, NONE, DEEP, NF1),				/* HDMI Data */
 	PAD_CFG_NF(GPP_E14, NONE, DEEP, NF1),				/* TCP0 Hot Plug */
 
+	/* PCH */
+	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),				/* C10 Gate */
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),				/* Platform Reset */
+
 	/* GPD2:	LAN_WAKE#		*/
 	PAD_NC(GPD2, NONE),
 	/* GPD6:	SIO_SLP_A#		*/
@@ -141,8 +145,6 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_GPO(GPP_B11, 1, PLTRST),
 	/* B12:	 PM_SLP_S0_N			*/
 	PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1),
-	/* B13:	 PLT_RST_N			*/
-	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
 	/* B14:	 TCH_PNL_PWR_EN			*/
 	PAD_CFG_GPO(GPP_B14, 1, PLTRST),
 	/* B15:	Not Connected			*/
@@ -373,8 +375,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_H16, NONE),
 	/* H17:	 GPPC_H_17_WWAN_DISABLE_N	*/
 	PAD_CFG_GPO(GPP_H17, 0, DEEP),
-	/* H18:	 GPPC_H_18_CPU_C10		*/
-	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),
 	/* H19:	Not Connected			*/
 	PAD_NC(GPP_H19, NONE),
 	/* H20:	Not Connected			*/
diff --git a/src/mainboard/starlabs/starbook/variants/kbl/gpio.c b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c
index b96476d1b0..9c195957d3 100644
--- a/src/mainboard/starlabs/starbook/variants/kbl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c
@@ -44,6 +44,9 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_E19, DN_20K, DEEP, NF1),				/* HDMI Data */
 	PAD_CFG_NF(GPP_E14, NONE, DEEP, NF1),				/* TCP0 Hot Plug */
 
+	/* PCH */
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),				/* Platform Reset */
+
 	/* GPD2:	Not Connected		*/
 	PAD_NC(GPD2, NONE),
 	/* GPD6:	Not Connected		*/
@@ -126,8 +129,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_B11, DN_20K),
 	/* GPP_B12	SLP_S0_N		*/
 	PAD_NC(GPP_B12, DN_20K),
-	/* GPP_B13:	SYS_RESET#		*/
-	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
 	/* GPP_B14:	HDA_SPKR		*/
 	PAD_NC(GPP_B14, DN_20K),
 	/* GPP_B15:	Not Connected		*/
diff --git a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c
index 5d95d61a89..0339413c02 100644
--- a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c
@@ -71,6 +71,11 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_D13, NATIVE, DEEP, NF1),				/* Data Input */
 	PAD_CFG_NF(GPP_D17, NATIVE, DEEP, NF1),				/* Reset */
 
+	/* PCH */
+	PAD_CFG_NF(GPP_H13, NONE, DEEP, NF1),				/* C10 Gate */
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),				/* Platform Reset */
+	PAD_CFG_GPI_SCI(GPP_E16, NONE, PLTRST, EDGE_SINGLE, INVERT),	/* Processor Hot */
+
 	/* V02:	PCIE_WAKE_LAN			*/
 	PAD_NC(GPP_V02, NONE),
 	/* V06:	GPD_6_SLP_A_N			*/
@@ -237,8 +242,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_E13, NONE),
 	/* E15:	BOOTHALT_N			*/
 	PAD_CFG_NF(GPP_E15, NONE, DEEP, NF2),
-	/* E16:	BC_PROCHOT_N			*/
-	PAD_CFG_GPI_SCI(GPP_E16, NONE, PLTRST, EDGE_SINGLE, INVERT),
 	/* E17:					*/
 	PAD_NC(GPP_E17, NONE),
 	/* E18:					*/
@@ -278,8 +281,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_H11, NONE),
 	/* H12:					*/
 	PAD_NC(GPP_H12, NONE),
-	/* H13:	CPU_C10_GATE_N_R		*/
-	PAD_CFG_NF(GPP_H13, NONE, DEEP, NF1),
 	/* H14:					*/
 	PAD_NC(GPP_H14, NONE),
 	/* H15:					*/
@@ -411,8 +412,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_B11, NONE),
 	/* B12:					*/
 	PAD_NC(GPP_B12, NONE),
-	/* B13:	PLT_RST_N			*/
-	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
 	/* B14:	Top Swap Override
 	 *		HIGH:	EMABLED
 	 *		LOW:	DISABLED
diff --git a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
index 0fed120f9a..4a328e6f66 100644
--- a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
@@ -66,6 +66,13 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_R3, NATIVE, DEEP, NF1),				/* Data Input */
 	PAD_CFG_NF(GPP_R4, NATIVE, DEEP, NF1),				/* Reset */
 
+	/* PCH */
+	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),				/* C10 Gate */
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),				/* Platform Reset */
+	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),				/* Vendor ID 0 */
+	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),				/* Vendor ID 1 */
+	PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),	/* Processor Hot */
+
 	/* GPD2:	LAN Wake					*/
 	PAD_NC(GPD2, NONE),
 	/* GPD6:	Sleep A						*/
@@ -111,12 +118,6 @@ const struct pad_config gpio_table[] = {
 	/* A23:		Not Connected					*/
 	PAD_NC(GPP_A23, NONE),
 
-	/* B0:		Core Vendor ID 0				*/
-	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),
-	/* B1:		Core Vendor ID 1				*/
-	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),
-	/* B2:		BC PROCHOT					*/
-	PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),
 	/* B3:		Not Connected					*/
 	PAD_NC(GPP_B3, NONE),
 	/* B4:		Not Connected					*/
@@ -135,8 +136,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_B10, NONE),
 	/* B12:		PM SLP S0					*/
 	PAD_NC(GPP_B12, NONE),
-	/* B13:		PLT RST						*/
-	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
 	/* B14:		Top Swap Override	Weak Internal PD 20K
 				High:	Enabled
 				Low:	Disabled			*/
@@ -368,8 +367,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_H14, NONE),
 	/* H16:		Not Connected					*/
 	PAD_NC(GPP_H16, NONE),
-	/* H18:		CPI C10 Gate					*/
-	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),
 	/* H20:		Not Connected					*/
 	PAD_NC(GPP_H20, NONE),
 	/* H21:		Not Connected					*/
diff --git a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c
index 6dae00171f..eb75e31af2 100644
--- a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c
@@ -58,6 +58,10 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_R3, NATIVE, DEEP, NF1),				/* Data Input */
 	PAD_NC(GPP_R4, NONE),						/* Reset */
 
+	/* PCH */
+	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),				/* C10 Gate */
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),				/* Platform Reset */
+
 	/* GPD2:	LAN_WAKE#		*/
 	PAD_NC(GPD2, NONE),
 	/* GPD6:	SIO_SLP_A#		*/
@@ -127,8 +131,6 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_B10, NONE, DEEP, NF1),
 	/* B12:	PM_SLP_S0_N			*/
 	PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1),
-	/* B13:	PLT_RST_N			*/
-	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
 	/* B14:	FPS_RST_N			*/
 	PAD_CFG_GPO(GPP_B14, 1, PLTRST),
 	/* B15:	Not Connected			*/
@@ -340,8 +342,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_H14, NONE),
 	/* H15:	Not Connected			*/
 	PAD_NC(GPP_H15, NONE),
-	/* H18:	CPU_C10_GATE_N			*/
-	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),
 	/* H19:	UART_BT_WAKE_N			*/
 	PAD_NC(GPP_H19, NONE),
 	/* H20:	Not Connected			*/
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
index 3b0fd464dc..b9b08919ce 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
@@ -76,6 +76,13 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_R3, NATIVE, DEEP, NF1),				/* Data Input */
 	PAD_CFG_NF(GPP_R4, NATIVE, DEEP, NF1),				/* Reset */
 
+	/* PCH */
+	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),				/* C10 Gate */
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),				/* Platform Reset */
+	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),				/* Vendor ID 0 */
+	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),				/* Vendor ID 1 */
+	PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),	/* Processor Hot */
+
 	/* GPD2:	LAN Wake					*/
 	PAD_NC(GPD2, NONE),
 	/* GPD6:	Sleep A						*/
@@ -120,12 +127,6 @@ const struct pad_config gpio_table[] = {
 	/* A23:		Not Connected					*/
 	PAD_NC(GPP_A23, NONE),
 
-	/* B0:		Core Vendor ID 0				*/
-	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),
-	/* B1:		Core Vendor ID 1				*/
-	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),
-	/* B2:		BC PROCHOT					*/
-	PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),
 	/* B3:		Not Connected					*/
 	PAD_NC(GPP_B3, NONE),
 	/* B4:		Not Connected					*/
@@ -363,8 +364,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_H14, NONE),
 	/* H16:		Not Connected					*/
 	PAD_NC(GPP_H16, NONE),
-	/* H18:		CPI C10 Gate					*/
-	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),
 	/* H19:		Clock Request 4		CPU M.2 SSD		*/
 	PAD_CFG_NF(GPP_H19, NONE, DEEP, NF1),
 	/* H20:		Not Connected					*/
diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c
index edb2cbcf9f..58e3d12f08 100644
--- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c
+++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c
@@ -64,6 +64,13 @@ const struct pad_config gpio_table[] = {
 	PAD_CFG_NF(GPP_R3, NATIVE, DEEP, NF1),				/* Data Input */
 	PAD_CFG_NF(GPP_R4, NATIVE, DEEP, NF1),				/* Reset */
 
+	/* PCH */
+	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),				/* C10 Gate */
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),				/* Platform Reset */
+	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),				/* Vendor ID 0 */
+	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),				/* Vendor ID 1 */
+	PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),	/* Processor Hot */
+
 	/* GPD2:	LAN Wake					*/
 	PAD_NC(GPD2, NONE),
 	/* GPD6:	Sleep A						*/
@@ -105,12 +112,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_A23, NONE),
 
 
-	/* B0:		Core Vendor ID 0				*/
-	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),
-	/* B1:		Core Vendor ID 1				*/
-	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),
-	/* B2:		BC PROCHOT					*/
-	PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),
 	/* B3:		Not Connected					*/
 	PAD_NC(GPP_B3, NONE),
 	/* B4:		Not Connected					*/
@@ -131,8 +132,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_B11, NONE),
 	/* B12:		PM SLP S0					*/
 	PAD_NC(GPP_B12, NONE),
-	/* B13:		PLT RST						*/
-	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
 	/* B14:		Webcam Privacy LED				*/
 	PAD_NC(GPP_B14, NONE),
 	/* B15:		Not Connected					*/
@@ -362,8 +361,6 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_H14, NONE),
 	/* H16:		Not Connected					*/
 	PAD_NC(GPP_H16, NONE),
-	/* H18:		CPI C10 Gate					*/
-	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),
 	/* H19:		Clock Request 4					*/
 	PAD_NC(GPP_H19, NONE),
 	/* H20:		Webcam Clock					*/