diff --git a/src/mainboard/lenovo/m900_tiny/devicetree.cb b/src/mainboard/lenovo/m900_tiny/devicetree.cb
index c2ac2ba780..88245c3c1d 100644
--- a/src/mainboard/lenovo/m900_tiny/devicetree.cb
+++ b/src/mainboard/lenovo/m900_tiny/devicetree.cb
@@ -162,8 +162,6 @@ chip soc/intel/skylake
 		end
 		device ref pcie_rp17 on # M.2 2280 / 2242 - SSD
 			register "PcieRpEnable[16]"			= "1"
-			register "PcieRpClkReqSupport[16]"		= "1"
-			register "PcieRpClkReqNumber[16]"		= "1"
 			register "PcieRpAdvancedErrorReporting[16]"	= "1"
 			register "PcieRpLtrEnable[16]"			= "true"
 			register "PcieRpClkSrcNumber[16]"		= "7"
@@ -171,8 +169,6 @@ chip soc/intel/skylake
 		end
 		device ref pcie_rp7 on # M.2 2230 - WLAN
 			register "PcieRpEnable[6]"			= "1"
-			register "PcieRpClkReqSupport[6]"		= "1"
-			register "PcieRpClkReqNumber[6]"		= "11"
 			register "PcieRpAdvancedErrorReporting[6]"	= "1"
 			register "PcieRpLtrEnable[6]"			= "true"
 			register "PcieRpClkSrcNumber[6]"		= "1"
diff --git a/src/mainboard/lenovo/m900_tiny/gpio.c b/src/mainboard/lenovo/m900_tiny/gpio.c
index aecea414a2..4c4bac4b8e 100644
--- a/src/mainboard/lenovo/m900_tiny/gpio.c
+++ b/src/mainboard/lenovo/m900_tiny/gpio.c
@@ -42,7 +42,7 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_GPI_TRIG_OWN(GPP_B3, NONE, PLTRST, OFF, ACPI),
 	PAD_CFG_GPI_TRIG_OWN(GPP_B4, NONE, PLTRST, OFF, ACPI),
 	PAD_NC(GPP_B5, NONE),
-	PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1),
+	PAD_CFG_GPI_TRIG_OWN(GPP_B6, NONE, PLTRST, OFF, ACPI),
 	PAD_NC(GPP_B7, NONE),
 	PAD_NC(GPP_B8, NONE),
 	PAD_NC(GPP_B9, NONE),
@@ -192,7 +192,7 @@ static const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_H2, NONE),
 	PAD_NC(GPP_H3, NONE),
 	PAD_CFG_GPI_TRIG_OWN(GPP_H4, NONE, PLTRST, OFF, ACPI),
-	PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1),
+	PAD_NC(GPP_H5, NONE),
 	PAD_CFG_GPI_TRIG_OWN(GPP_H6, NONE, PLTRST, OFF, ACPI),
 	PAD_NC(GPP_H7, NONE),
 	PAD_NC(GPP_H8, NONE),