Recent patches declares board_usb_init function prototype for a new usb architecture.
Turning on the OMAP_XHCI defines cause a redefinition compiler failure. So update the board_usb_init to the latest prototype.
Signed-off-by: Dan Murphy dmurphy@ti.com ---
v2 - Adopted to board_usb_init and not create a new API - http://patchwork.ozlabs.org/patch/281931/
board/ti/omap5_uevm/evm.c | 2 +- drivers/usb/host/xhci-omap.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index 228df29..6a01200 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -219,7 +219,7 @@ void usb_hub_reset_devices(int port) * * @return 0 */ -int board_usb_init(void) +int board_usb_init(int index, enum board_usb_init_type init) { int ret; #ifdef CONFIG_PALMAS_USB_SS_PWR diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c index a8702da..4f98c77 100644 --- a/drivers/usb/host/xhci-omap.c +++ b/drivers/usb/host/xhci-omap.c @@ -182,11 +182,12 @@ static void omap_enable_phy_clocks(struct omap_xhci *omap)
};
-inline int __board_usb_init(void) +inline int __board_usb_init(int index, enum board_usb_init_type init) { return 0; } -int board_usb_init(void) __attribute__((weak, alias("__board_usb_init"))); +int board_usb_init(int index, enum board_usb_init_type init) \ + __attribute__((weak, alias("__board_usb_init")));
static void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode) { @@ -295,7 +296,7 @@ int xhci_hcd_init(int index, struct xhci_hccr **hccr, struct xhci_hcor **hcor) ctx->usb3_phy = (struct omap_usb3_phy *)OMAP_OCP1_SCP_BASE; ctx->otg_wrapper = (struct omap_dwc_wrapper *)OMAP_OTG_WRAPPER_BASE;
- ret = board_usb_init(); + ret = board_usb_init(index, USB_INIT_HOST); if (ret != 0) { puts("Failed to initialize board for USB\n"); return ret;