Skip to contentSkip to conversation

Fix USB init sequence for the lwmon5 board.

PATCH New sascha.laue at liebherr.com 3 participants 3 messages Oct 9, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix USB init sequence for the lwmon5 board.

From: Sascha Laue <[email protected]>

---
 board/lwmon5/lwmon5.c |   44 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 39 insertions(+), 5 deletions(-)
board/lwmon5/lwmon5.c +39 -5
index 8975bfd..5e310f4 100644
@@ -145,7 +145,7 @@ int misc_init_r(void)
 	u32 reg;
 	unsigned long usb2d0cr = 0;
 	unsigned long usb2phy0cr, usb2h0cr = 0;
-	unsigned long sdr0_pfc1;
+	unsigned long sdr0_pfc1, sdr0_srst;
 
 	/*
 	 * FLASH stuff...
@@ -207,6 +207,15 @@ int misc_init_r(void)
 	/*
 	 * USB suff...
 	 */
+
+	/* Reset USB peripherie */
+	mtsdr(SDR0_SRST0, SDR0_SRST0_USB2H | SDR0_SRST0_USB2D );
+        mtsdr(SDR0_SRST1, SDR0_SRST1_USB20PHY | SDR0_SRST1_USB2HUTMI \
+		| SDR0_SRST1_USB2HPHY | SDR0_SRST1_OPBA2 \
+		| SDR0_SRST1_PLB42OPB1 | SDR0_SRST1_OPB2PLB40 );
+
+	udelay(100);	
+
 	/* SDR Setting */
 	mfsdr(SDR0_PFC1, sdr0_pfc1);
 	mfsdr(SDR0_USB0, usb2d0cr);
@@ -234,13 +243,38 @@ int misc_init_r(void)
 	mtsdr(SDR0_USB2PHY0CR, usb2phy0cr);
 	mtsdr(SDR0_USB2H0CR, usb2h0cr);
 
-	/*
-	 * Clear resets
-	 */
+	/* the 440EPx controllers need this sequence to initiate the EHCI */
+	
+	/* deassert reset to USBPHY */
+	mfsdr(SDR0_SRST1, sdr0_srst);
+	sdr0_srst &= ~SDR0_SRST1_USB20PHY;
+	mtsdr(SDR0_SRST1, sdr0_srst);
+
 	udelay (1000);
-	mtsdr(SDR0_SRST1, 0x00000000);
+
+	/* deassert reset to HOST*/
+	mfsdr(SDR0_SRST1, sdr0_srst);
+	sdr0_srst &= ~( SDR0_SRST0_USB2H );
+	mtsdr(SDR0_SRST1, sdr0_srst);
+
+	udelay(4000);
+
+	/* deassert reset to OPB1, P4OPB0, OPB2, PLB42OPB1, OPB2PLB40 cores */
+	mfsdr(SDR0_SRST1, sdr0_srst);
+	sdr0_srst &= ~( SDR0_SRST1_OPBA1 	| \ 
+			SDR0_SRST1_P4OPB0       | \
+			SDR0_SRST1_OPBA2        | \
+			SDR0_SRST1_PLB42OPB1    | \
+			SDR0_SRST1_OPB2PLB40);
+	mtsdr(SDR0_SRST1, sdr0_srst);
+
 	udelay (1000);
+	
+	/* deassert all other resets */
 	mtsdr(SDR0_SRST0, 0x00000000);
+	mtsdr(SDR0_SRST1, 0x00000000);
+
+	udelay(1000);
 
 	printf("USB:   Host(int phy) Device(ext phy)\n");
 
Signature · 1 line
1.5.2.4
#1 lore raw

PATCH 1/1 Fix USB init sequence for the lwmon5 board.

Dear sascha.laue at liebherr.com,

Quoted 1 line · In message <[email protected]> you wrote:

From: Sascha Laue <[email protected]>

Please remove this from the message body.

board/lwmon5/lwmon5.c int misc_init_r(void) · line 213

Quoted 8 lines
board/lwmon5/lwmon5.c +4 -0
@@ -207,6 +207,15 @@ int misc_init_r(void)
 	/*
 	 * USB suff...
 	 */
+
+	/* Reset USB peripherie */
+	mtsdr(SDR0_SRST0, SDR0_SRST0_USB2H | SDR0_SRST0_USB2D );
+        mtsdr(SDR0_SRST1, SDR0_SRST1_USB20PHY | SDR0_SRST1_USB2HUTMI \

^^^^^^^^^^^^
Indentation by TAB, please.

Viele Gr??e,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"We don't have to protect the environment -- the Second Coming is  at
hand."                                                   - James Watt
#2 lore raw

PATCH 1/1 Fix USB init sequence for the lwmon5 board.

In reply to sascha.laue at liebherr.com
Quoted 21 lines · sascha.laue at liebherr.com

From: Sascha Laue <[email protected]>

---
 board/lwmon5/lwmon5.c |   44 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 39 insertions(+), 5 deletions(-)
board/lwmon5/lwmon5.c +1 -1
index 8975bfd..5e310f4 100644
@@ -145,7 +145,7 @@ int misc_init_r(void)
 	u32 reg;
 	unsigned long usb2d0cr = 0;
 	unsigned long usb2phy0cr, usb2h0cr = 0;
-	unsigned long sdr0_pfc1;
+	unsigned long sdr0_pfc1, sdr0_srst;
 
 	/*
 	 * FLASH stuff...

board/lwmon5/lwmon5.c int misc_init_r(void) · line 216

Quoted 10 lines
board/lwmon5/lwmon5.c +7 -0
@@ -207,6 +207,15 @@ int misc_init_r(void)
 	/*
 	 * USB suff...
 	 */
+
+	/* Reset USB peripherie */
+	mtsdr(SDR0_SRST0, SDR0_SRST0_USB2H | SDR0_SRST0_USB2D );
+        mtsdr(SDR0_SRST1, SDR0_SRST1_USB20PHY | SDR0_SRST1_USB2HUTMI \
+		| SDR0_SRST1_USB2HPHY | SDR0_SRST1_OPBA2 \
+		| SDR0_SRST1_PLB42OPB1 | SDR0_SRST1_OPB2PLB40 );
+

I think these mtsdrs are not needed. These bits are all set after CPU reset. So setting them again makes no sense.

But this reset sequence is full of magic at all. So I could imagine that it's needed :-)

Matthias

Quoted 48 lines
board/lwmon5/lwmon5.c +31 -4
+	udelay(100);	
+
 	/* SDR Setting */
 	mfsdr(SDR0_PFC1, sdr0_pfc1);
 	mfsdr(SDR0_USB0, usb2d0cr);
@@ -234,13 +243,38 @@ int misc_init_r(void)
 	mtsdr(SDR0_USB2PHY0CR, usb2phy0cr);
 	mtsdr(SDR0_USB2H0CR, usb2h0cr);
 
-	/*
-	 * Clear resets
-	 */
+	/* the 440EPx controllers need this sequence to initiate the EHCI */
+	
+	/* deassert reset to USBPHY */
+	mfsdr(SDR0_SRST1, sdr0_srst);
+	sdr0_srst &= ~SDR0_SRST1_USB20PHY;
+	mtsdr(SDR0_SRST1, sdr0_srst);
+
 	udelay (1000);
-	mtsdr(SDR0_SRST1, 0x00000000);
+
+	/* deassert reset to HOST*/
+	mfsdr(SDR0_SRST1, sdr0_srst);
+	sdr0_srst &= ~( SDR0_SRST0_USB2H );
+	mtsdr(SDR0_SRST1, sdr0_srst);
+
+	udelay(4000);
+
+	/* deassert reset to OPB1, P4OPB0, OPB2, PLB42OPB1, OPB2PLB40 cores */
+	mfsdr(SDR0_SRST1, sdr0_srst);
+	sdr0_srst &= ~( SDR0_SRST1_OPBA1 	| \ 
+			SDR0_SRST1_P4OPB0       | \
+			SDR0_SRST1_OPBA2        | \
+			SDR0_SRST1_PLB42OPB1    | \
+			SDR0_SRST1_OPB2PLB40);
+	mtsdr(SDR0_SRST1, sdr0_srst);
+
 	udelay (1000);
+	
+	/* deassert all other resets */
 	mtsdr(SDR0_SRST0, 0x00000000);
+	mtsdr(SDR0_SRST1, 0x00000000);
+
+	udelay(1000);
 
 	printf("USB:   Host(int phy) Device(ext phy)\n");
 
Signature · 13 lines
-------------------------------------------------------------------------
Dipl.-Ing. Matthias Fuchs
Head of System Design

esd electronic system design gmbh
Vahrenwalder Str. 207 - 30165 Hannover - GERMANY
Phone: +49-511-37298-0 - Fax: +49-511-37298-68
Please visit our homepage http://www.esd.eu
Quality Products - Made in Germany
-------------------------------------------------------------------------
Gesch?ftsf?hrer: Klaus Detering, Dr. Werner Schulze
Amtsgericht Hannover HRB 51373 - VAT-ID DE 115672832
-------------------------------------------------------------------------