diff options
| author | Uri Mashiach <uri.mashiach@compulab.co.il> | 2017-02-23 15:39:37 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-08 11:38:37 -0400 |
| commit | 1a9a5f7a39d655868d7e51327786ca6bccbbec68 (patch) | |
| tree | fda5f24a059c931e40ad94f0aeeb971c0d067371 /board/ti/dra7xx | |
| parent | ef3f3b8100b28f2110c8a5f5181a5d6ee5db9160 (diff) | |
| download | u-boot-1a9a5f7a39d655868d7e51327786ca6bccbbec68.tar.gz u-boot-1a9a5f7a39d655868d7e51327786ca6bccbbec68.tar.xz u-boot-1a9a5f7a39d655868d7e51327786ca6bccbbec68.zip | |
usb: host: xhci-omap: fix double weak board_usb_init functions
A weak version of the function board_usb_init is implemented in:
common/usb.c
drivers/usb/host/xhci-omap.c
To fix the double implementations:
* Convert the board_usb_init function in drivers/usb/host/xhci-omap.c
normal (not weak).
* The function board_usb_init in drivers/usb/host/xhci-omap.c calls to
the weak function omap_xhci_board_usb_init.
* Rename board version of the function board_usb_init to
omap_xhci_board_usb_init.
Done only for boards that defines CONFIG_USB_XHCI_OMAP.
To achieve the same flexibility with the function board_usb_cleanup:
* Add a normal (not weak) implementation of the function
board_usb_cleanup in drivers/usb/host/xhci-omap.c
* The function board_usb_cleanup in drivers/usb/host/xhci-omap.c calls
to the weak function omap_xhci_board_usb_cleanup.
* Rename board version of the function board_usb_cleanup to
omap_xhci_board_usb_cleanup.
Done only for boards that defines CONFIG_USB_XHCI_OMAP.
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Acked-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Roger Quadros <rogerq@ti.com>
Diffstat (limited to 'board/ti/dra7xx')
| -rw-r--r-- | board/ti/dra7xx/evm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index ed0bc181cf..d8e48dd3f8 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -750,7 +750,7 @@ static struct ti_usb_phy_device usb_phy2_device = { .index = 1, }; -int board_usb_init(int index, enum usb_init_type init) +int omap_xhci_board_usb_init(int index, enum usb_init_type init) { enable_usb_clocks(index); switch (index) { @@ -787,7 +787,7 @@ int board_usb_init(int index, enum usb_init_type init) return 0; } -int board_usb_cleanup(int index, enum usb_init_type init) +int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) { switch (index) { case 0: |