summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
Diffstat (limited to 'payloads')
-rw-r--r--payloads/libpayload/drivers/usb/ehci_private.h1
-rw-r--r--payloads/libpayload/drivers/usb/ehci_rh.c13
2 files changed, 13 insertions, 1 deletions
diff --git a/payloads/libpayload/drivers/usb/ehci_private.h b/payloads/libpayload/drivers/usb/ehci_private.h
index 6fa5f0344d..8ac15b3093 100644
--- a/payloads/libpayload/drivers/usb/ehci_private.h
+++ b/payloads/libpayload/drivers/usb/ehci_private.h
@@ -49,6 +49,7 @@ typedef volatile u32 portsc_t;
typedef volatile struct {
#define HCS_NPORTS_MASK 0xf
+#define HCS_PORT_POWER_CONTROL 0x10
u8 caplength;
u8 res1;
u16 hciversion;
diff --git a/payloads/libpayload/drivers/usb/ehci_rh.c b/payloads/libpayload/drivers/usb/ehci_rh.c
index dd073a3b99..d84069e613 100644
--- a/payloads/libpayload/drivers/usb/ehci_rh.c
+++ b/payloads/libpayload/drivers/usb/ehci_rh.c
@@ -137,10 +137,21 @@ ehci_rh_init (usbdev_t *dev)
debug("root hub has %x ports\n", RH_INST(dev)->n_ports);
+ /* If the host controller has port power control, enable power on
+ * all ports and wait 20ms.
+ */
+ if (EHCI_INST(dev->controller)->capabilities->hcsparams
+ & HCS_PORT_POWER_CONTROL) {
+ debug("host controller has port power control, "
+ "giving power to all ports.\n");
+ for (i=0; i < RH_INST(dev)->n_ports; i++)
+ RH_INST(dev)->ports[i] |= P_PP;
+ }
+ mdelay(20); // ehci spec 2.3.9
+
RH_INST(dev)->devices = malloc(RH_INST(dev)->n_ports * sizeof(int));
for (i=0; i < RH_INST(dev)->n_ports; i++) {
RH_INST(dev)->devices[i] = -1;
- RH_INST(dev)->ports[i] |= P_PP;
ehci_rh_scanport(dev, i);
}