diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
index c36e582a98..a3d0bc6836 100644
--- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
@@ -154,6 +154,10 @@ chip soc/intel/cannonlake
 			end
 		end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
+		chip drivers/intel/wifi
+			register "wake" = "GPE0_PME_B0"
+			device pci 14.3 on  end # CNVi wifi
+		end
 		device pci 14.5 off end # SDCard
 		device pci 15.0 on
 			chip drivers/i2c/generic
diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c
index 6bb2e76d4a..8d69682668 100644
--- a/src/mainboard/google/hatch/variants/baseboard/gpio.c
+++ b/src/mainboard/google/hatch/variants/baseboard/gpio.c
@@ -71,6 +71,12 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_E20, DN_20K),
 	/* DDPD_CTRLCLK => NC */
 	PAD_NC(GPP_E22, DN_20K),
+	/* GPIO_WWAN_WLAN_COEX3 */
+	PAD_CFG_NF(GPP_F0, NONE, DEEP, NF1),
+	/* UART_WWANTX_WLANRX_COEX1 */
+	PAD_CFG_NF(GPP_F8, NONE, DEEP, NF1),
+	/* UART_WWANRX_WLANTX_COEX2 */
+	PAD_CFG_NF(GPP_F9, NONE, DEEP, NF1),
 	/* PCH_MEM_STRAP0 */
 	PAD_CFG_GPI(GPP_F20, NONE, PLTRST),
 	/* PCH_MEM_STRAP1 */