From: Markus Klotzbuecher <mk@denx.de>
Date: Wed, 9 Jan 2008 12:57:10 +0000 (+0100)
Subject: Merge git://www.denx.de/git/u-boot
X-Git-Tag: v2008.10-rc1~808^2~42^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a40ef62c4300e9f606deef0a4618cbc4b514a51;hp=07eb02687f008721974a2fb54cd7fdc28033ab3c;p=platform%2Fkernel%2Fu-boot.git

Merge git://www.denx.de/git/u-boot

Conflicts:

	board/tqm5200/tqm5200.c
---

diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c
index f33d172..905a043 100644
--- a/board/tqm5200/tqm5200.c
+++ b/board/tqm5200/tqm5200.c
@@ -444,6 +444,7 @@ ulong post_word_load (void)
 #ifdef CONFIG_BOARD_EARLY_INIT_R
 int board_early_init_r (void)
 {
+
 	extern int usb_cpu_init(void);
 
 #ifdef CONFIG_PS2MULT
diff --git a/cpu/pxa/usb.c b/cpu/pxa/usb.c
index 72b7dfa..aa6f4b7 100644
--- a/cpu/pxa/usb.c
+++ b/cpu/pxa/usb.c
@@ -89,6 +89,22 @@ int usb_cpu_stop(void)
 
 int usb_cpu_init_fail(void)
 {
+	UHCHR |= UHCHR_FHR;
+	udelay(11);
+	UHCHR &= ~UHCHR_FHR;
+
+	UHCCOMS |= 1;
+	udelay(10);
+
+#if defined(CONFIG_CPU_MONAHANS)
+	UHCHR |= UHCHR_SSEP0;
+#endif
+#if defined(CONFIG_PXA27X)
+	UHCHR |= UHCHR_SSEP2;
+#endif
+	UHCHR |= UHCHR_SSEP1;
+	UHCHR |= UHCHR_SSE;
+
 	return 0;
 }