[U-Boot] [PATCH v2 0/3] usb: host/gadget: Miscellaneous fixes
Changes from v1: Added reviewed-by.
This patch series is split from [1] to contain only the usb host/gadget fixes.
[1] -> http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/229188
Kishon Vijay Abraham I (3): usb: gadget: ether: Perform board initialization from ethernet gadget driver usb: host: xhci-omap: invoke board_usb_cleanup in xhci_hcd_stop usb: gadget: ether: populate _reset_ callback
drivers/usb/gadget/ether.c | 5 +++++ drivers/usb/host/xhci-omap.c | 1 + 2 files changed, 6 insertions(+)
Ethernet gadget driver can be used both by both SPL and u-boot. Since usb_eth_init() is the entry point for ethernet gadget driver, perform board initialization there. Also perform the cleanup in usb_eth_halt.
Signed-off-by: Kishon Vijay Abraham I kishon@ti.com Acked-by: Marek Vasut marex@denx.de Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Lukasz Majewski l.majewski@samsung.com --- drivers/usb/gadget/ether.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 141ff8b..850ba02 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -15,6 +15,7 @@ #include <linux/usb/cdc.h> #include <linux/usb/gadget.h> #include <net.h> +#include <usb.h> #include <malloc.h> #include <linux/ctype.h>
@@ -2312,6 +2313,8 @@ static int usb_eth_init(struct eth_device *netdev, bd_t *bd) goto fail; }
+ board_usb_init(0, USB_INIT_DEVICE); + /* Configure default mac-addresses for the USB ethernet device */ #ifdef CONFIG_USBNET_DEV_ADDR strlcpy(dev_addr, CONFIG_USBNET_DEV_ADDR, sizeof(dev_addr)); @@ -2492,6 +2495,7 @@ void usb_eth_halt(struct eth_device *netdev) }
usb_gadget_unregister_driver(ð_driver); + board_usb_cleanup(0, USB_INIT_DEVICE); }
static struct usb_gadget_driver eth_driver = {
xhci omap driver has board_usb_init in xhci_hcd_init but doesn't have the corresponding cleanup function in xhci_hcd_stop.
Fix it here by invoking board_usb_cleanup() in xhci_hcd_stop().
Signed-off-by: Kishon Vijay Abraham I kishon@ti.com Acked-by: Marek Vasut marex@denx.de Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Lukasz Majewski l.majewski@samsung.com --- drivers/usb/host/xhci-omap.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c index 3a55208..104e7a7 100644 --- a/drivers/usb/host/xhci-omap.c +++ b/drivers/usb/host/xhci-omap.c @@ -96,4 +96,5 @@ void xhci_hcd_stop(int index) struct omap_xhci *ctx = &omap;
omap_xhci_core_exit(ctx); + board_usb_cleanup(index, USB_INIT_HOST); }
populate _reset_ callback to the USB ethernet gadget since UDC core expects every gadget driver to have the reset callback. This shouldn't be needed once the ethernet gadget driver is adapted to use the composite driver.
Signed-off-by: Kishon Vijay Abraham I kishon@ti.com Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Lukasz Majewski l.majewski@samsung.com --- drivers/usb/gadget/ether.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 850ba02..53f4672 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -2505,6 +2505,7 @@ static struct usb_gadget_driver eth_driver = { .unbind = eth_unbind,
.setup = eth_setup, + .reset = eth_disconnect, .disconnect = eth_disconnect,
.suspend = eth_suspend,
On Wednesday, August 19, 2015 at 10:19:45 AM, Kishon Vijay Abraham I wrote:
Changes from v1: Added reviewed-by.
This patch series is split from [1] to contain only the usb host/gadget fixes.
[1] -> http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/229188
Applied all three to u-boot-usb/master, thanks !
Best regards, Marek Vasut
On Thursday 20 August 2015 02:00 AM, Marek Vasut wrote:
On Wednesday, August 19, 2015 at 10:19:45 AM, Kishon Vijay Abraham I wrote:
Changes from v1: Added reviewed-by.
This patch series is split from [1] to contain only the usb host/gadget fixes.
[1] -> http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/229188
Applied all three to u-boot-usb/master, thanks !
Thanks Marek!
-Kishon
On Thursday, August 20, 2015 at 07:52:18 AM, Kishon Vijay Abraham I wrote:
On Thursday 20 August 2015 02:00 AM, Marek Vasut wrote:
On Wednesday, August 19, 2015 at 10:19:45 AM, Kishon Vijay Abraham I wrote:
Changes from v1: Added reviewed-by.
This patch series is split from [1] to contain only the usb host/gadget fixes.
[1] -> http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/229188
Applied all three to u-boot-usb/master, thanks !
Thanks Marek!
No problem, PR is out too, so it should reach Tom quickly.
Best regards, Marek Vasut
participants (2)
-
Kishon Vijay Abraham I -
Marek Vasut