diff --git a/src/southbridge/intel/lynxpoint/acpi/ehci.asl b/src/southbridge/intel/lynxpoint/acpi/ehci.asl
new file mode 100644
index 0000000000..2a54304a2c
--- /dev/null
+++ b/src/southbridge/intel/lynxpoint/acpi/ehci.asl
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+// EHCI Controller 0:1d.0
+
+Device (EHCI)
+{
+	Name (_ADR, 0x001d0000)
+
+	Name (_PRW, Package () { DEFAULT_PRW_VALUE, 3 })
+
+	// Leave USB ports on for to allow Wake from USB
+
+	Method (_S3D, 0)	// Highest D State in S3 State
+	{
+		Return (2)
+	}
+
+	Method (_S4D, 0)	// Highest D State in S4 State
+	{
+		Return (2)
+	}
+
+	Device (HUB7)
+	{
+		Name (_ADR, 0)
+
+		Device (PRT1) { Name (_ADR, 1) } // USB Port 0
+		Device (PRT2) { Name (_ADR, 2) } // USB Port 1
+		Device (PRT3) { Name (_ADR, 3) } // USB Port 2
+		Device (PRT4) { Name (_ADR, 4) } // USB Port 3
+		Device (PRT5) { Name (_ADR, 5) } // USB Port 4
+		Device (PRT6) { Name (_ADR, 6) } // USB Port 5
+	}
+}
diff --git a/src/southbridge/intel/lynxpoint/acpi/pch.asl b/src/southbridge/intel/lynxpoint/acpi/pch.asl
index e683c752ce..40d206d3dd 100644
--- a/src/southbridge/intel/lynxpoint/acpi/pch.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/pch.asl
@@ -67,8 +67,11 @@ Scope (\)
 // PCI Express Ports 0:1c.x
 #include <southbridge/intel/common/acpi/pcie.asl>
 
-// USB 0:1d.0 and 0:1a.0
-#include "usb.asl"
+// USB EHCI 0:1d.0 and 0:1a.0
+#include "ehci.asl"
+
+// USB XHCI 0:14.0
+#include "xhci.asl"
 
 // LPC Bridge 0:1f.0
 #include "lpc.asl"
diff --git a/src/southbridge/intel/lynxpoint/acpi/usb.asl b/src/southbridge/intel/lynxpoint/acpi/xhci.asl
similarity index 91%
rename from src/southbridge/intel/lynxpoint/acpi/usb.asl
rename to src/southbridge/intel/lynxpoint/acpi/xhci.asl
index fbb7090819..65f1869e10 100644
--- a/src/southbridge/intel/lynxpoint/acpi/usb.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/xhci.asl
@@ -1,38 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-// EHCI Controller 0:1d.0
-
-Device (EHCI)
-{
-	Name (_ADR, 0x001d0000)
-
-	Name (_PRW, Package () { DEFAULT_PRW_VALUE, 3 })
-
-	// Leave USB ports on for to allow Wake from USB
-
-	Method (_S3D, 0)	// Highest D State in S3 State
-	{
-		Return (2)
-	}
-
-	Method (_S4D, 0)	// Highest D State in S4 State
-	{
-		Return (2)
-	}
-
-	Device (HUB7)
-	{
-		Name (_ADR, 0)
-
-		Device (PRT1) { Name (_ADR, 1) } // USB Port 0
-		Device (PRT2) { Name (_ADR, 2) } // USB Port 1
-		Device (PRT3) { Name (_ADR, 3) } // USB Port 2
-		Device (PRT4) { Name (_ADR, 4) } // USB Port 3
-		Device (PRT5) { Name (_ADR, 5) } // USB Port 4
-		Device (PRT6) { Name (_ADR, 6) } // USB Port 5
-	}
-}
-
 // XHCI Controller 0:14.0
 
 Device (XHCI)