diff --git a/payloads/libpayload/configs/config.fox_wtm2 b/payloads/libpayload/configs/config.fox_wtm2
index 42dd5cbb45..99881cbfa0 100644
--- a/payloads/libpayload/configs/config.fox_wtm2
+++ b/payloads/libpayload/configs/config.fox_wtm2
@@ -61,15 +61,16 @@ CONFIG_LP_TIMER_RDTSC=y
 # CONFIG_LP_SPEAKER is not set
 # CONFIG_LP_STORAGE is not set
 CONFIG_LP_USB=y
-CONFIG_LP_USB_UHCI=y
-CONFIG_LP_USB_OHCI=y
-CONFIG_LP_USB_EHCI=y
-# CONFIG_LP_USB_XHCI is not set
+# CONFIG_LP_USB_UHCI is not set
+# CONFIG_LP_USB_OHCI is not set
+# CONFIG_LP_USB_EHCI is not set
+CONFIG_LP_USB_XHCI=y
 CONFIG_LP_USB_HID=y
 CONFIG_LP_USB_HUB=y
 CONFIG_LP_USB_MSC=y
 CONFIG_LP_USB_PCI=y
 CONFIG_LP_USB_GEN_HUB=y
+# CONFIG_LP_USB_MEMORY is not set
 # CONFIG_LP_BIG_ENDIAN is not set
 CONFIG_LP_LITTLE_ENDIAN=y
 CONFIG_LP_IO_ADDRESS_SPACE=y
diff --git a/src/mainboard/intel/wtm2/acpi/chromeos.asl b/src/mainboard/intel/wtm2/acpi/chromeos.asl
index 40ffcf0156..4cd6dedf46 100644
--- a/src/mainboard/intel/wtm2/acpi/chromeos.asl
+++ b/src/mainboard/intel/wtm2/acpi/chromeos.asl
@@ -18,7 +18,7 @@
  */
 
 Name(OIPG, Package() {
-	Package () { 0x0001, 0, 0xFF, "LynxPoint" }, // recovery
-	Package () { 0x0002, 0, 0xFF, "LynxPoint" }, // developer
-	Package () { 0x0003, 0, 0xFF, "LynxPoint" }, // firmware write protect
+	Package () { 0x0001, 0, 0xFFFFFFFF, "PCH-LP" }, // recovery
+	Package () { 0x0002, 0, 0xFFFFFFFF, "PCH-LP" }, // developer
+	Package () { 0x0003, 0, 0xFFFFFFFF, "PCH-LP" }, // firmware write protect
 })
diff --git a/src/mainboard/intel/wtm2/pei_data.c b/src/mainboard/intel/wtm2/pei_data.c
index a33dddfe30..e67d8e58ef 100644
--- a/src/mainboard/intel/wtm2/pei_data.c
+++ b/src/mainboard/intel/wtm2/pei_data.c
@@ -47,11 +47,11 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
 			   USB_PORT_FRONT_PANEL);
 	pei_data_usb2_port(pei_data, 6, 0x40, 1, USB_OC_PIN_SKIP,
 			   USB_PORT_FRONT_PANEL);
-	pei_data_usb2_port(pei_data, 7, 0x40, 0, USB_OC_PIN_SKIP,
+	pei_data_usb2_port(pei_data, 7, 0x40, 1, USB_OC_PIN_SKIP,
 			   USB_PORT_FRONT_PANEL);
 
 	pei_data_usb3_port(pei_data, 0, 1, USB_OC_PIN_SKIP, 0);
 	pei_data_usb3_port(pei_data, 1, 1, USB_OC_PIN_SKIP, 0);
-	pei_data_usb3_port(pei_data, 2, 0, USB_OC_PIN_SKIP, 0);
-	pei_data_usb3_port(pei_data, 3, 0, USB_OC_PIN_SKIP, 0);
+	pei_data_usb3_port(pei_data, 2, 1, USB_OC_PIN_SKIP, 0);
+	pei_data_usb3_port(pei_data, 3, 1, USB_OC_PIN_SKIP, 0);
 }