summaryrefslogtreecommitdiffstats
path: root/board/trizepsiv/conxs.c
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2009-07-01 04:33:56 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-07-06 21:52:55 +0200
commit88bd97501314683b87f3f1edcf55b347c041b722 (patch)
tree1adf6231e856a7aad901b51df1a8b60727ebabce /board/trizepsiv/conxs.c
parent0b785ddd60120cfb74d18e58c56054238219f6db (diff)
downloadblackbird-obmc-uboot-88bd97501314683b87f3f1edcf55b347c041b722.tar.gz
blackbird-obmc-uboot-88bd97501314683b87f3f1edcf55b347c041b722.zip
xscale: fix USB initialization for Trizepsiv module
Due to change in the usb_board_init() prototype, the USB for the TrizepsIV was not correctly initialized. Removed dummy print from usb_board_stop(). Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'board/trizepsiv/conxs.c')
-rw-r--r--board/trizepsiv/conxs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c
index 5c0eb41d4b..53b6e0014e 100644
--- a/board/trizepsiv/conxs.c
+++ b/board/trizepsiv/conxs.c
@@ -50,7 +50,7 @@ extern struct serial_device serial_stuart_device;
* Miscelaneous platform dependent initialisations
*/
-void usb_board_init(void)
+int usb_board_init(void)
{
UHCHR = (UHCHR | UHCHR_PCPL | UHCHR_PSPL) &
~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE);
@@ -71,6 +71,8 @@ void usb_board_init(void)
/* Set port power control mask bits, only 3 ports. */
UHCRHDB |= (0x7<<17);
+
+ return 0;
}
void usb_board_init_fail(void)
@@ -89,7 +91,6 @@ void usb_board_stop(void)
CKEN &= ~CKEN10_USBHOST;
- puts("Called USB STOP\n");
return;
}
OpenPOWER on IntegriCloud