Add a misc driver for DWC3 wrapper, so that based on dr_mode the USB devices can bind to USB host or USB device drivers.
Signed-off-by: Mugunthan V N mugunthanvnm@ti.com --- drivers/usb/dwc3/core.h | 4 ++++ drivers/usb/dwc3/dwc3-omap.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/dwc3/gadget.c | 2 +- 3 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 72d2fcd..24f03e4 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -713,7 +713,11 @@ struct dwc3 { /* device lock */ spinlock_t lock;
+#ifndef CONFIG_DM_USB struct device *dev; +#else + struct udevice *dev; +#endif
struct platform_device *xhci; struct resource xhci_resources[DWC3_XHCI_RESOURCES_NUM]; diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 31d15f5..fef7deb 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -27,6 +27,11 @@
#include "linux-compat.h"
+#include <libfdt.h> +#include <dm/device.h> + +DECLARE_GLOBAL_DATA_PTR; + /* * All these registers belong to OMAP's Wrapper around the * DesignWare USB3 Core. @@ -134,6 +139,8 @@ struct dwc3_omap { u32 index; };
+#ifndef CONFIG_DM_USB + static LIST_HEAD(dwc3_omap_list);
static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset) @@ -461,3 +468,48 @@ MODULE_ALIAS("platform:omap-dwc3"); MODULE_AUTHOR("Felipe Balbi balbi@ti.com"); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("DesignWare USB3 OMAP Glue Layer"); + +#else + +static int ti_dwc3_wrapper_bind(struct udevice *parent) +{ + const void *fdt = gd->fdt_blob; + int node; + + for (node = fdt_first_subnode(fdt, parent->of_offset); node > 0; + node = fdt_next_subnode(fdt, node)) { + const char *name = fdt_get_name(fdt, node, NULL); + enum usb_dr_mode dr_mode; + + if (strncmp(name, "usb@", 4)) + continue; + + dr_mode = usb_get_dr_mode(node); + switch (dr_mode) { + case USB_DR_MODE_PERIPHERAL: + case USB_DR_MODE_OTG: + /* Bind MUSB device */ + break; + case USB_DR_MODE_HOST: + /* Bind MUSB host */ + break; + default: + break; + }; + } + return 0; +} + +static const struct udevice_id ti_dwc3_ids[] = { + { .compatible = "ti,am437x-dwc3" }, + { } +}; + +U_BOOT_DRIVER(ti_dwc3_wrapper) = { + .name = "ti-dwc3-wrapper", + .id = UCLASS_MISC, + .of_match = ti_dwc3_ids, + .bind = ti_dwc3_wrapper_bind, +}; + +#endif /* CONFIG_DM_USB */ diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 25ccc01..d6fcea7 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2611,7 +2611,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) if (ret) goto err4;
- ret = usb_add_gadget_udc(dwc->dev, &dwc->gadget); + ret = usb_add_gadget_udc((struct device *)dwc->dev, &dwc->gadget); if (ret) { dev_err(dwc->dev, "failed to register udc\n"); goto err4;