mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-25 13:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb: omap5: Update the board_usb_init api

Browse Source 
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>
This commit is contained in:
Dan Murphy 2013-10-11 12:28:15 -05:00 committed by Marek Vasut
parent 41b667b834
commit b216821189
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/ti/omap5_uevm/evm.c
View File

@ -219,7 +219,7 @@ void usb_hub_reset_devices(int port)
* *
* @return 0 * @return 0
*/ */
int board_usb_init(void) int board_usb_init(int index, enum board_usb_init_type init)
{ {
int ret; int ret;
#ifdef CONFIG_PALMAS_USB_SS_PWR #ifdef CONFIG_PALMAS_USB_SS_PWR

7
drivers/usb/host/xhci-omap.c
View File

@ -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; 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) 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->usb3_phy = (struct omap_usb3_phy *)OMAP_OCP1_SCP_BASE;
ctx->otg_wrapper = (struct omap_dwc_wrapper *)OMAP_OTG_WRAPPER_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) { if (ret != 0) {
puts("Failed to initialize board for USB\n"); puts("Failed to initialize board for USB\n");
return ret; return ret;