summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-01-09 22:41:02 +0100
committerWolfgang Denk <wd@denx.de>2008-01-09 22:41:02 +0100
commitcc557950f742fe18003638963e267d52036159ce (patch)
treed2735bf9f13bf56c6c71e7543e365a5005f65142
parent7ca90513486abd4ae50bd1b7403f47cc58c5ad25 (diff)
parent58694f9709c0c3e3178e349ae748d98cfb0c639a (diff)
downloadu-boot-imx-cc557950f742fe18003638963e267d52036159ce.zip
u-boot-imx-cc557950f742fe18003638963e267d52036159ce.tar.gz
u-boot-imx-cc557950f742fe18003638963e267d52036159ce.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-usb
-rw-r--r--board/tqm5200/tqm5200.c1
-rw-r--r--cpu/pxa/usb.c16
2 files changed, 17 insertions, 0 deletions
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;
}