diff --git a/src/soc/amd/stoneyridge/enable_usbdebug.c b/src/soc/amd/stoneyridge/enable_usbdebug.c
index 5220457e45..0a0c3ec66d 100644
--- a/src/soc/amd/stoneyridge/enable_usbdebug.c
+++ b/src/soc/amd/stoneyridge/enable_usbdebug.c
@@ -20,6 +20,7 @@
 #include <arch/io.h>
 #include <device/pci_ehci.h>
 #include <device/pci_def.h>
+#include <soc/pci_devs.h>
 #include <soc/southbridge.h>
 
 pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx)
@@ -28,12 +29,7 @@ pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx)
 	outb(0xef, PM_INDEX);
 	outb(0x7f, PM_DATA);
 
-	if (hcd_idx == 3)
-		return PCI_DEV(0, 0x16, 0);
-	else if (hcd_idx == 2)
-		return PCI_DEV(0, 0x13, 0);
-	else
-		return PCI_DEV(0, 0x12, 0);
+	return SOC_EHCI1_DEV;
 }
 
 void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port)