diff --git a/board/zoombini/board.c b/board/zoombini/board.c
index a0ed098658..0a276d506d 100644
--- a/board/zoombini/board.c
+++ b/board/zoombini/board.c
@@ -89,6 +89,7 @@ const struct power_signal_info power_signal_list[] = {
 	{GPIO_PCH_SLP_SUS_L,  POWER_SIGNAL_ACTIVE_HIGH, "SLP_SUS_DEASSERTED"},
 	{GPIO_RSMRST_L_PGOOD, POWER_SIGNAL_ACTIVE_HIGH, "RSMRST_L_PGOOD"},
 	{GPIO_PMIC_DPWROK,    POWER_SIGNAL_ACTIVE_HIGH, "PMIC_DPWROK"},
+	{GPIO_PP5000_PGOOD,   POWER_SIGNAL_ACTIVE_HIGH, "PP5000_A_PGOOD"},
 };
 BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
diff --git a/board/zoombini/board.h b/board/zoombini/board.h
index dcfcb9c41c..e8d36ad460 100644
--- a/board/zoombini/board.h
+++ b/board/zoombini/board.h
@@ -105,10 +105,6 @@
 #define PD_POWER_SUPPLY_TURN_ON_DELAY	30000  /* us */
 #define PD_POWER_SUPPLY_TURN_OFF_DELAY	250000 /* us */
 
-#define CONFIG_WIRELESS
-#define WIRELESS_GPIO_WLAN_POWER GPIO_EN_PP3300_WLAN
-#define WIRELESS_GPIO_WWAN GPIO_EN_PP3300_WWAN
-
 /* I2C Ports */
 #define I2C_PORT_BATTERY I2C_PORT_POWER
 #define I2C_PORT_CHARGER I2C_PORT_POWER
@@ -154,6 +150,7 @@ enum power_signal {
 	X86_SLP_SUS_DEASSERTED,
 	X86_RSMRST_L_PGOOD,
 	X86_PMIC_DPWROK,
+	PP5000_PGOOD,
 	POWER_SIGNAL_COUNT
 };
 
diff --git a/board/zoombini/gpio.inc b/board/zoombini/gpio.inc
index 2bc00e97b8..438de4f586 100644
--- a/board/zoombini/gpio.inc
+++ b/board/zoombini/gpio.inc
@@ -28,12 +28,11 @@ GPIO_INT(PCH_SLP_SUS_L,   PIN(D, 4), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signa
 GPIO_INT(RSMRST_L_PGOOD,  PIN(E, 2), GPIO_INT_BOTH, power_signal_interrupt)
 GPIO_INT(PMIC_DPWROK,     PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt)
 GPIO_INT(PMIC_INT_L,      PIN(D, 5), GPIO_INT_FALLING | GPIO_PULL_UP, power_signal_interrupt)
+GPIO_INT(PP5000_PGOOD,    PIN(C, 0), GPIO_INT_BOTH, power_signal_interrupt)
 
 /* Power Enables. */
 GPIO(EN_PP3300_DSW,        PIN(6, 0), GPIO_OUT_HIGH)
 GPIO(EN_PP3300_TRACKPAD,   PIN(B, 7), GPIO_OUT_LOW)
-GPIO(EN_PP3300_WLAN,       PIN(C, 0), GPIO_OUT_LOW)
-GPIO(EN_PP3300_WWAN,       PIN(D, 7), GPIO_OUT_LOW)
 GPIO(EN_PP5000,            PIN(7, 3), GPIO_OUT_LOW)
 
 GPIO(ENTERING_RW,         PIN(E, 1), GPIO_OUT_LOW)
diff --git a/power/cannonlake.h b/power/cannonlake.h
index 404558441f..735f91a2b5 100644
--- a/power/cannonlake.h
+++ b/power/cannonlake.h
@@ -19,7 +19,8 @@
 
 #define IN_PGOOD_ALL_CORE POWER_SIGNAL_MASK(X86_PMIC_DPWROK)
 
-#define IN_ALL_S0 (IN_PGOOD_ALL_CORE | IN_ALL_PM_SLP_DEASSERTED)
+#define IN_ALL_S0 (IN_PGOOD_ALL_CORE | IN_ALL_PM_SLP_DEASSERTED | \
+		   POWER_SIGNAL_MASK(PP5000_PGOOD))
 
 #define CHIPSET_G3S5_POWERUP_SIGNAL IN_PCH_SLP_SUS_DEASSERTED