diff options
author | Tom Rini <trini@ti.com> | 2013-10-21 08:10:36 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-10-21 08:10:36 -0400 |
commit | 748bde608a8dfea5b64e186af4d9c27642fe7813 (patch) | |
tree | 8564b610e812404bd320ddea458fc585d9c49d7e /board/balloon3/balloon3.c | |
parent | 9dff87a297dabe4af60012ad2d990ff8967f1d55 (diff) | |
parent | 449697f14ebc9f7cb5bf15bbad0d46c6ca2c4979 (diff) | |
download | u-boot-imx-748bde608a8dfea5b64e186af4d9c27642fe7813.zip u-boot-imx-748bde608a8dfea5b64e186af4d9c27642fe7813.tar.gz u-boot-imx-748bde608a8dfea5b64e186af4d9c27642fe7813.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'board/balloon3/balloon3.c')
-rw-r--r-- | board/balloon3/balloon3.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/board/balloon3/balloon3.c b/board/balloon3/balloon3.c index ecbac16..04e0574 100644 --- a/board/balloon3/balloon3.c +++ b/board/balloon3/balloon3.c @@ -13,6 +13,7 @@ #include <asm/io.h> #include <spartan3.h> #include <command.h> +#include <usb.h> DECLARE_GLOBAL_DATA_PTR; @@ -59,7 +60,7 @@ void dram_init_banksize(void) } #ifdef CONFIG_CMD_USB -int usb_board_init(void) +int board_usb_init(int index, enum usb_init_type init) { writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) & ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE), @@ -90,9 +91,9 @@ int usb_board_init(void) return 0; } -void usb_board_init_fail(void) +int board_usb_cleanup(int index, enum usb_init_type init) { - return; + return 0; } void usb_board_stop(void) |