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>

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>
Stefano Babic · Jean-Christophe PLAGNIOL-VILLARD
1 parent 0b785ddd60
Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff
board/trizepsiv/conxs.c
@@ -50,7 +50,7 @@
  * 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 @@
  
 	/* Set port power control mask bits, only 3 ports. */
 	UHCRHDB |= (0x7<<17);
+
+	return 0;
 }
  
 void usb_board_init_fail(void)
@@ -89,7 +91,6 @@
  
 	CKEN &= ~CKEN10_USBHOST;
  
-	puts("Called USB STOP\n");
 	return;
 }
...	...	@@ -50,7 +50,7 @@
50	50	* Miscelaneous platform dependent initialisations
51	51	*/
52	52
53		-void usb_board_init(void)
	53	+int usb_board_init(void)
54	54	{
55	55	UHCHR = (UHCHR \| UHCHR_PCPL \| UHCHR_PSPL) &
56	56	~(UHCHR_SSEP0 \| UHCHR_SSEP1 \| UHCHR_SSEP2 \| UHCHR_SSE);
...	...	@@ -71,6 +71,8 @@
71	71
72	72	/* Set port power control mask bits, only 3 ports. */
73	73	UHCRHDB \|= (0x7<<17);
	74	+
	75	+ return 0;
74	76	}
75	77
76	78	void usb_board_init_fail(void)
...	...	@@ -89,7 +91,6 @@
89	91
90	92	CKEN &= ~CKEN10_USBHOST;
91	93
92		- puts("Called USB STOP\n");
93	94	return;
94	95	}
95	96