diff --git a/src/mainboard/google/hatch/variants/dooly/gpio.c b/src/mainboard/google/hatch/variants/dooly/gpio.c
index 5a911fc4f9..4406c060eb 100644
--- a/src/mainboard/google/hatch/variants/dooly/gpio.c
+++ b/src/mainboard/google/hatch/variants/dooly/gpio.c
@@ -5,38 +5,56 @@
 #include <commonlib/helpers.h>
 
 static const struct pad_config gpio_table[] = {
-	/* A16 : SD_OC_ODL */
-	PAD_CFG_GPI(GPP_A16, NONE, DEEP),
-	/* A18 : LAN_PE_ISOLATE_ODL */
-	PAD_CFG_GPO(GPP_A18, 1, DEEP),
+	/* A17 : SD_VDD1_PWR_EN */
+	PAD_NC(GPP_A17, NONE),
+	/* A18 : GPP_A18 */
+	PAD_NC(GPP_A18, NONE),
+	/* A19 : GPP_A19 */
+	PAD_NC(GPP_A19, NONE),
+	/* A20 : TOUCH_INT_ODL */
+	PAD_CFG_GPI_APIC(GPP_A20, NONE, PLTRST, LEVEL, NONE),
+	/* A21 : FPMCU_PCH_BOOT0 */
+	PAD_NC(GPP_A21, NONE),
+	/* A22 : FPMCU_PCH_INT_L */
+	PAD_NC(GPP_A22, NONE),
 	/* A23 : M2_WLAN_INT_ODL */
 	PAD_CFG_GPI_APIC(GPP_A23, NONE, PLTRST, LEVEL, INVERT),
 
-	/* B5 : LAN_CLKREQ_ODL */
-	PAD_CFG_NF(GPP_B5, NONE, DEEP, NF1),
-
 	/* C0 : SMBCLK */
 	PAD_CFG_NF(GPP_C0, NONE, DEEP, NF1),
 	/* C1 : SMBDATA */
 	PAD_CFG_NF(GPP_C1, NONE, DEEP, NF1),
+	/* C3  : GPP_C3 */
+	PAD_NC(GPP_C3, NONE),
+	/* C4  : GPP_C4 */
+	PAD_NC(GPP_C4, NONE),
 	/* C6: M2_WLAN_WAKE_ODL */
 	PAD_CFG_GPI_SCI_LOW(GPP_C6, NONE, DEEP, EDGE_SINGLE),
 	/* C7 : LAN_WAKE_ODL */
-	PAD_CFG_GPI_SCI_LOW(GPP_C7, NONE, DEEP, EDGE_SINGLE),
-	/* C10 : PCH_PCON_RST_ODL */
-	PAD_CFG_GPO(GPP_C10, 1, DEEP),
-	/* C11 : PCH_PCON_PDB_ODL */
-	PAD_CFG_GPO(GPP_C11, 1, DEEP),
+	PAD_NC(GPP_C7, NONE),
+	/* C11 : GPP_C11 */
+	PAD_NC(GPP_C11, NONE),
 	/* C15  : WLAN_OFF_L */
 	PAD_CFG_GPO(GPP_C15, 1, DEEP),
+	/* C18 : GPP_C18 */
+	PAD_NC(GPP_C18, NONE),
+	/* C19 : GPP_C19 */
+	PAD_NC(GPP_C19, NONE),
+
+	/* D16 : DMIC_ON_OFF MIC_SWITCH_L */
+	PAD_CFG_GPI(GPP_D16, NONE, DEEP),
 
 	/* E2  : EN_PP_MST_OD */
 	PAD_CFG_GPO(GPP_E2, 1, DEEP),
-	/* E9 : USB_A0_OC_ODL */
-	PAD_CFG_NF(GPP_E9, NONE, DEEP, NF1),
-	/* E10 : USB_A1_OC_ODL */
-	PAD_CFG_NF(GPP_E10, NONE, DEEP, NF1),
 
+	/* F0 : GPP_F0 */
+	PAD_NC(GPP_F0, NONE),
+	/* F1 : GPP_F1 */
+	PAD_NC(GPP_F1, NONE),
+	/* F8 : GPP_F8 */
+	PAD_NC(GPP_F8, NONE),
+	/* F9 : GPP_F9 */
+	PAD_NC(GPP_F9, NONE),
 	/* F11 : EMMC_CMD */
 	PAD_CFG_NF(GPP_F11, NONE, DEEP, NF1),
 	/* F12 : EMMC_DATA0 */
@@ -62,12 +80,31 @@ static const struct pad_config gpio_table[] = {
 	/* F22 : EMMC_RST_L */
 	PAD_CFG_NF(GPP_F22, NONE, DEEP, NF1),
 
-	/* H4: PCH_I2C_PCON_SDA */
+	/* G0  : SD_CMD */
+	PAD_NC(GPP_G0, NONE),
+	/* G1  : SD_DATA0 */
+	PAD_NC(GPP_G1, NONE),
+	/* G2  : SD_DATA1 */
+	PAD_NC(GPP_G2, NONE),
+	/* G3  : SD_DATA2 */
+	PAD_NC(GPP_G3, NONE),
+	/* G4  : SD_DATA3 */
+	PAD_NC(GPP_G4, NONE),
+	/* G5  : SD_CD */
+	PAD_NC(GPP_G5, NONE),
+	/* G6  : SD_CLK */
+	PAD_NC(GPP_G6, NONE),
+
+	/* H3  : SPK_AMP_ON */
+	PAD_CFG_GPO(GPP_H3, 1, DEEP),
+	/* H4: LVDS_SDA */
 	PAD_CFG_NF(GPP_H4, NONE, DEEP, NF1),
-	/* H5: PCH_I2C_PCON_SCL */
+	/* H5: LVDS_SDL */
 	PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1),
-	/* H22 : PWM_PP3300_BIOZZER */
-	PAD_CFG_GPO(GPP_H22, 0, DEEP),
+	/* H6 : PCH_I2C_TOUCH_SDA */
+	PAD_CFG_NF(GPP_H6, NONE, DEEP, NF1),
+	/* H7 : PCH_I2C_TOUCH_SDL */
+	PAD_CFG_NF(GPP_H7, NONE, DEEP, NF1),
 };
 
 const struct pad_config *override_gpio_table(size_t *num)