diff options
| author | Dan Murphy | 2013-10-11 12:28:15 -0500 |
|---|---|---|
| committer | Marek Vasut | 2013-10-20 23:42:41 +0200 |
| commit | b2168211893013925b2d1975276cc9442bae83cb (patch) | |
| tree | 63dd5ccfbcbb57ed7edbacc125e8f6e7ec551cd8 /drivers/usb | |
| parent | 41b667b834aaf550faabbf1d222a456cb4fc97ec (diff) | |
usb: omap5: Update the board_usb_init api
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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/xhci-omap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c index a8702dadf7d..4f98c777a42 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; |