diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c index 69508d07a5..27ccd7a62e 100644 --- a/arch/arm/src/sama5/sam_ohci.c +++ b/arch/arm/src/sama5/sam_ohci.c @@ -430,7 +430,7 @@ static int sam_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); #endif #ifdef CONFIG_USBHOST_HUB static int sam_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhsot_hubport_s *hport, + FAR struct usbhost_hubport_s *hport, bool connected); #endif static void sam_disconnect(FAR struct usbhost_driver_s *drvr); @@ -2257,8 +2257,8 @@ static int sam_wait(FAR struct usbhost_connection_s *conn, *hport = connport; irqrestore(flags); - usbhost_vtrace2(EHCI_VTRACE2_MONWAKEUP, - connport->port + 1, connport->connected); + usbhost_vtrace2(OHCI_VTRACE2_HUBWAKEUP, + HPORT(connport), connport->connected); return OK; } #endif @@ -3312,7 +3312,7 @@ static int sam_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) #ifdef CONFIG_USBHOST_HUB static int sam_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhsot_hubport_s *hport, + FAR struct usbhost_hubport_s *hport, bool connected) { irqstate_t flags; diff --git a/arch/arm/src/sama5/sam_usbhost.c b/arch/arm/src/sama5/sam_usbhost.c index 97cd3782e9..db8ff89abb 100644 --- a/arch/arm/src/sama5/sam_usbhost.c +++ b/arch/arm/src/sama5/sam_usbhost.c @@ -178,6 +178,9 @@ static const struct sam_usbhost_trace_s g_trace2[TRACE2_NSTRINGS] = TRENTRY(OHCI_VTRACE2_CTRLOUT, TR_OHCI, TR_FMT2, "OHCI CTRLOUT RHPort%d req: %02x\n"), TRENTRY(OHCI_VTRACE2_TRANSFER, TR_OHCI, TR_FMT2, "OHCI EP%d buflen: %d\n"), TRENTRY(OHCI_VTRACE2_INITCONNECTED, TR_OHCI, TR_FMT2, "OHCI RHPort%d Device connected: %d\n"), +#ifdef CONFIG_USBHOST_HUB + TRENTRY(OHCI_VTRACE2_HUBWAKEUP, TR_OHCI, TR_FMT2, "OHCI Hub Port%d connected: %d\n"), +#endif #endif #endif diff --git a/arch/arm/src/sama5/sam_usbhost.h b/arch/arm/src/sama5/sam_usbhost.h index 79264b6110..d19600fd4c 100644 --- a/arch/arm/src/sama5/sam_usbhost.h +++ b/arch/arm/src/sama5/sam_usbhost.h @@ -156,13 +156,16 @@ enum usbhost_trace1codes_e OHCI_VTRACE2_RHPORTST, /* OHCI RHPORTST */ OHCI_VTRACE2_CONNECTED, /* OHCI RHPort connected */ OHCI_VTRACE2_DISCONNECTED, /* OHCI RHPort disconnected */ - OHCI_VTRACE2_WAKEUP, /* OHCI RHPort connected */ + OHCI_VTRACE2_WAKEUP, /* OHCI RHPort connected wakeup */ OHCI_VTRACE2_EP0CTRLED, /* OHCI RHPort EP0 CTRL */ OHCI_VTRACE2_EPALLOC, /* OHCI EP CTRL */ OHCI_VTRACE2_CTRLIN, /* OHCI CTRLIN */ OHCI_VTRACE2_CTRLOUT, /* OHCI CTRLOUT */ OHCI_VTRACE2_TRANSFER, /* OHCI EP buflen */ OHCI_VTRACE2_INITCONNECTED, /* OHCI RHPort Device connected */ +#ifdef CONFIG_USBHOST_HUB + OHCI_VTRACE2_HUBWAKEUP, /* EHCI Hub Port connected wakeup */ +#endif #endif #endif diff --git a/configs/sama5d3-xplained/README.txt b/configs/sama5d3-xplained/README.txt index 32abebc5df..00a1ee3809 100644 --- a/configs/sama5d3-xplained/README.txt +++ b/configs/sama5d3-xplained/README.txt @@ -1495,6 +1495,13 @@ file1: CONFIG_USBHOST_ISOC_DISABLE=y 2. Stack usage make increase when USB hub support is enabled because the nesting depth of certain USB host class logic can increase. + STATUS: + 2015-05-01: + This USB host function does not work on the SAMA5D3-Xplained board. + Those same drivers work on the other SAMA5Dx boards and so I believe + that there is some issue with either clocking to USB or to powering + of the USB host ports. + Mass Storage Device Usage ------------------------- diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt index 0413a728d3..cfa78b7455 100644 --- a/configs/sama5d4-ek/README.txt +++ b/configs/sama5d4-ek/README.txt @@ -2046,6 +2046,10 @@ USB High-Speed Host 2. Stack usage make increase when USB hub support is enabled because the nesting depth of certain USB host class logic can increase. + STATUS: + 2015-05-01: + Verified that normal, non-hub OHCI still works. + Mass Storage Device Usage ------------------------- @@ -4220,7 +4224,7 @@ Configurations the console device. 2. This configuration was verified using the SAMA5D4-MB, Rev C. board. - There may be some differences in released SAMA5D4-EK board. Also, + There may be some differences in the released SAMA5D4-EK board. Also, this configuration assumes that you have the TM7000 LCD/Touchscreen attached. If you do not, you should disable the LCD and touchscreen drivers as described above under "TM7000 LCD/Touchscreen" and also