diff --git a/src/mainboard/amd/gardenia/acpi/gpe.asl b/src/mainboard/amd/gardenia/acpi/gpe.asl
index 9a8469832b..e713ad6688 100644
--- a/src/mainboard/amd/gardenia/acpi/gpe.asl
+++ b/src/mainboard/amd/gardenia/acpi/gpe.asl
@@ -35,12 +35,7 @@ Scope(\_GPE) {	/* Start Scope GPE */
 	/*  USB controller PME#  */
 	Method(_L0B) {
 		/* DBGO("\\_GPE\\_L0B\n") */
-		Notify(\_SB.PCI0.UOH1, 0x02) /* NOTIFY_DEVICE_WAKE */
-		Notify(\_SB.PCI0.UOH2, 0x02) /* NOTIFY_DEVICE_WAKE */
-		Notify(\_SB.PCI0.UOH3, 0x02) /* NOTIFY_DEVICE_WAKE */
-		Notify(\_SB.PCI0.UOH4, 0x02) /* NOTIFY_DEVICE_WAKE */
-		Notify(\_SB.PCI0.UOH5, 0x02) /* NOTIFY_DEVICE_WAKE */
-		Notify(\_SB.PCI0.UOH6, 0x02) /* NOTIFY_DEVICE_WAKE */
+		Notify(\_SB.PCI0.EHC0, 0x02) /* NOTIFY_DEVICE_WAKE */
 		Notify(\_SB.PCI0.XHC0, 0x02) /* NOTIFY_DEVICE_WAKE */
 		Notify(\_SB.PWRB, 0x02) /* NOTIFY_DEVICE_WAKE */
 	}
diff --git a/src/mainboard/google/kahlee/acpi/gpe.asl b/src/mainboard/google/kahlee/acpi/gpe.asl
index eed4e81fab..e5bcf220de 100644
--- a/src/mainboard/google/kahlee/acpi/gpe.asl
+++ b/src/mainboard/google/kahlee/acpi/gpe.asl
@@ -39,12 +39,7 @@ Scope (\_GPE)
 	Method (_L0B)
 	{
 		/* DBGO ("\\_GPE\\_L0B\n") */
-		Notify (\_SB.PCI0.UOH1, 0x02)	/* NOTIFY_DEVICE_WAKE */
-		Notify (\_SB.PCI0.UOH2, 0x02)	/* NOTIFY_DEVICE_WAKE */
-		Notify (\_SB.PCI0.UOH3, 0x02)	/* NOTIFY_DEVICE_WAKE */
-		Notify (\_SB.PCI0.UOH4, 0x02)	/* NOTIFY_DEVICE_WAKE */
-		Notify (\_SB.PCI0.UOH5, 0x02)	/* NOTIFY_DEVICE_WAKE */
-		Notify (\_SB.PCI0.UOH6, 0x02)	/* NOTIFY_DEVICE_WAKE */
+		Notify (\_SB.PCI0.EHC0, 0x02)	/* NOTIFY_DEVICE_WAKE */
 		Notify (\_SB.PCI0.XHC0, 0x02)	/* NOTIFY_DEVICE_WAKE */
 		Notify (\_SB.PWRB, 0x02)	/* NOTIFY_DEVICE_WAKE */
 	}
diff --git a/src/soc/amd/stoneyridge/acpi/usb.asl b/src/soc/amd/stoneyridge/acpi/usb.asl
index 30fac2aea9..b93555a2ed 100644
--- a/src/soc/amd/stoneyridge/acpi/usb.asl
+++ b/src/soc/amd/stoneyridge/acpi/usb.asl
@@ -14,41 +14,12 @@
  * GNU General Public License for more details.
  */
 
-/* 0:12.0 - OHCI */
-Device(UOH1) {
+/* 0:12.0 - EHCI */
+Device(EHC0) {
 	Name(_ADR, 0x00120000)
 	Name(_PRW, Package() {0x0b, 3})
-} /* end UOH1 */
+} /* end EHC0 */
 
-/* 0:12.2 - EHCI */
-Device(UOH2) {
-	Name(_ADR, 0x00120002)
-	Name(_PRW, Package() {0x0b, 3})
-} /* end UOH2 */
-
-/* 0:13.0 - OHCI */
-Device(UOH3) {
-	Name(_ADR, 0x00130000)
-	Name(_PRW, Package() {0x0b, 3})
-} /* end UOH3 */
-
-/* 0:13.2 - EHCI */
-Device(UOH4) {
-	Name(_ADR, 0x00130002)
-	Name(_PRW, Package() {0x0b, 3})
-} /* end UOH4 */
-
-/* 0:16.0 - OHCI */
-Device(UOH5) {
-	Name(_ADR, 0x00160000)
-	Name(_PRW, Package() {0x0b, 3})
-} /* end UOH5 */
-
-/* 0:16.2 - EHCI */
-Device(UOH6) {
-	Name(_ADR, 0x00160002)
-	Name(_PRW, Package() {0x0b, 3})
-} /* end UOH5 */
 
 /* 0:10.0 - XHCI 0*/
 Device(XHC0) {