From: Stefano Babic Date: Wed, 1 Jul 2009 02:33:56 +0000 (+0200) Subject: xscale: fix USB initialization for Trizepsiv module X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=88bd97501314683b87f3f1edcf55b347c041b722;p=u-boot.git 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 --- 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; }