diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c
index aa2fe579a2..6106342e58 100644
--- a/payloads/libpayload/drivers/usb/xhci.c
+++ b/payloads/libpayload/drivers/usb/xhci.c
@@ -303,16 +303,15 @@ hci_t *
 xhci_pci_init (pcidev_t addr)
 {
 	u32 reg_addr;
-	hci_t controller;
+	hci_t *controller;
 
 	reg_addr = (u32)phys_to_virt(pci_read_config32 (addr, 0x10) & ~0xf);
-	//controller->reg_base = pci_read_config32 (addr, 0x14) & ~0xf;
 	if (pci_read_config32 (addr, 0x14) > 0) {
 		fatal("We don't do 64bit addressing.\n");
 	}
 
 	controller = xhci_init((void *)(unsigned long)reg_addr);
-	controller->bus_address = addr;
+	controller->pcidev = addr;
 
 	xhci_switch_ppt_ports(addr);
 
@@ -414,7 +413,8 @@ xhci_shutdown(hci_t *const controller)
 
 	xhci_stop(controller);
 
-	xhci_switchback_ppt_ports(controller->bus_address);
+        if (controller->pcidev)
+		xhci_switchback_ppt_ports(controller->pcidev);
 
 	if (xhci->sp_ptrs) {
 		const size_t max_sp_bufs = xhci->capreg->Max_Scratchpad_Bufs;
diff --git a/payloads/libpayload/drivers/usb/xhci.h b/payloads/libpayload/drivers/usb/xhci.h
index b76c9829b3..ddc9297b58 100644
--- a/payloads/libpayload/drivers/usb/xhci.h
+++ b/payloads/libpayload/drivers/usb/xhci.h
@@ -34,7 +34,7 @@
 #include <usb/usb.h>
 
 hci_t *xhci_pci_init (pcidev_t addr);
-hci_t *xhci_init (void *bar);
+hci_t *xhci_init (const void *bar);
 
 void xhci_rh_init (usbdev_t *dev);
 
diff --git a/payloads/libpayload/include/usb/usb.h b/payloads/libpayload/include/usb/usb.h
index a351690418..0bfbc20327 100644
--- a/payloads/libpayload/include/usb/usb.h
+++ b/payloads/libpayload/include/usb/usb.h
@@ -119,6 +119,7 @@ typedef enum { OHCI = 0, UHCI = 1, EHCI = 2, XHCI = 3} hc_type;
 struct usbdev_hc {
 	hci_t *next;
 	u32 reg_base;
+	pcidev_t pcidev; // 0 if not used (eg on ARM)
 	hc_type type;
 	usbdev_t *devices[128];	// dev 0 is root hub, 127 is last addressable