diff --git a/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/ec.h b/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/ec.h
index aa8f052b47..e4edd51378 100644
--- a/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/ec.h
+++ b/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/ec.h
@@ -75,7 +75,7 @@
 /* Enable EC backed PD MCU device in ACPI */
 #define EC_ENABLE_PD_MCU_DEVICE
 
-#if !CONFIG(BOARD_GOOGLE_OCELOT) && !CONFIG(BOARD_GOOGLE_OCELOT4ES) && \
+#if !CONFIG(BOARD_GOOGLE_OCELOTMCHP) && !CONFIG(BOARD_GOOGLE_OCELOTMCHP4ES) && \
 !CONFIG(BOARD_GOOGLE_OJAL)
  #define EC_ENABLE_SYNC_IRQ      /* Enable tight timestamp / wake support */
  #define EC_SYNC_IRQ_WAKE_CAPABLE /* Let the OS know ec_sync is wake capable */
diff --git a/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h b/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h
index a0983a543a..409c4d58e0 100644
--- a/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h
+++ b/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h
@@ -12,11 +12,14 @@
  * EC_SYNC_IRQ - GPIO IRQ for tight timestamps / wake support
  * GPIO_PCH_WP - WP signal to PCH
  */
-//TODO for Nuvo: #define EC_SYNC_IRQ	GPP_E07_IRQ
-#if CONFIG(BOARD_GOOGLE_MODEL_OCELOT) || CONFIG(BOARD_GOOGLE_MODEL_OJAL)
+#if (CONFIG(BOARD_GOOGLE_OCELOTMCHP) || CONFIG(BOARD_GOOGLE_OCELOTMCHP4ES) \
+	|| CONFIG(BOARD_GOOGLE_MODEL_OJAL))
  #define EC_SYNC_IRQ	0 /* Not Connected */
 #elif CONFIG(BOARD_GOOGLE_MODEL_KODKOD)
  #define EC_SYNC_IRQ	GPP_F10_IRQ
+#elif (CONFIG(BOARD_GOOGLE_OCELOT) || CONFIG(BOARD_GOOGLE_OCELOT4ES) \
+	|| CONFIG(BOARD_GOOGLE_OCELOTITE) || CONFIG(BOARD_GOOGLE_OCELOTITE4ES))
+ #define EC_SYNC_IRQ	GPP_E08_IRQ
 #elif CONFIG(BOARD_GOOGLE_MODEL_MATSU)
  #define EC_SYNC_IRQ	GPP_E08_IRQ
 #endif
diff --git a/src/mainboard/google/ocelot/variants/ocelot/gpio.c b/src/mainboard/google/ocelot/variants/ocelot/gpio.c
index 32e1ae11fb..405a424600 100644
--- a/src/mainboard/google/ocelot/variants/ocelot/gpio.c
+++ b/src/mainboard/google/ocelot/variants/ocelot/gpio.c
@@ -171,8 +171,13 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_GPI_TRIG_OWN(GPP_E06, NONE, DEEP, LEVEL, ACPI),
 	/* GPP_E07:     LAN_GPIO_RST_N */
 	PAD_CFG_GPO(GPP_E07, 1, PLTRST),
+#if CONFIG(BOARD_GOOGLE_OCELOTMCHP) || CONFIG(BOARD_GOOGLE_OCELOTMCHP4ES)
+	/* GPP_E08:     Not used */
+	PAD_NC(GPP_E08, NONE),
+#else
 	/* GPP_E08:     EC_SOC_INT_ODL */
-	PAD_CFG_GPI(GPP_E08, NONE, DEEP),
+	PAD_CFG_GPI_APIC_LOCK(GPP_E08, NONE, LEVEL, INVERT, LOCK_CONFIG),
+#endif
 	/* GPP_E09:     USB_FP_CONN_1_CONN_2_OC0_N */
 	PAD_CFG_NF(GPP_E09, NONE, DEEP, NF1),
 	/* GPP_E10:     M2_UFS_DET_SEL_N */