diff --git a/src/mainboard/ocp/tiogapass/devicetree.cb b/src/mainboard/ocp/tiogapass/devicetree.cb
index 850443854f..a9bfe7f0fb 100644
--- a/src/mainboard/ocp/tiogapass/devicetree.cb
+++ b/src/mainboard/ocp/tiogapass/devicetree.cb
@@ -49,6 +49,7 @@ chip soc/intel/xeon_sp/skx
 	end
 
 	device domain 0 on
+		device gpio 0 alias pch_gpio on end
 		device pci 00.0 on end # Host bridge
 		device pci 04.0 on end # Intel Corporation SkyLake-E CBDMA Registers
 		device pci 04.1 on end # Intel Corporation SkyLake-E CBDMA Registers
@@ -77,8 +78,11 @@ chip soc/intel/xeon_sp/skx
 		device pci 1f.0 on
 			chip drivers/ipmi # BMC KCS
 				device pnp ca2.0 on end
+				use pch_gpio as gpio_dev
 				register "bmc_i2c_address" = "0x20"
 				register "bmc_boot_timeout" = "90"
+				register "post_complete_gpio" = "GPP_B20"
+				register "post_complete_invert" = "1"
 			end
 			chip drivers/ipmi/ocp # OCP specific IPMI porting
 				device pnp ca2.1 on end
diff --git a/src/mainboard/ocp/tiogapass/ramstage.c b/src/mainboard/ocp/tiogapass/ramstage.c
index df7720538e..1439c3be0e 100644
--- a/src/mainboard/ocp/tiogapass/ramstage.c
+++ b/src/mainboard/ocp/tiogapass/ramstage.c
@@ -3,9 +3,7 @@
 #include <bootstate.h>
 #include <drivers/ipmi/ipmi_ops.h>
 #include <drivers/ocp/dmi/ocp_dmi.h>
-#include <gpio.h>
 #include <soc/ramstage.h>
-#include <soc/lewisburg_pch_gpio_defs.h>
 
 extern struct fru_info_str fru_strings;
 
@@ -136,12 +134,6 @@ void mainboard_silicon_init_params(FSPS_UPD *params)
 {
 }
 
-static void pull_post_complete_pin(void *unused)
-{
-	/* Pull Low post complete pin */
-	gpio_output(GPP_B20, 0);
-}
-
 #if CONFIG(GENERATE_SMBIOS_TABLES)
 static int mainboard_smbios_data(struct device *dev, int *handle, unsigned long *current)
 {
@@ -189,5 +181,3 @@ struct chip_operations mainboard_ops = {
 	.enable_dev = mainboard_enable,
 	.final = mainboard_final,
 };
-
-BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, pull_post_complete_pin, NULL);