projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
7ca9051
)
Merge branch 'master' of git://www.denx.de/git/u-boot-usb
author
Wolfgang Denk
<wd@denx.de>
Wed, 9 Jan 2008 21:41:02 +0000
(22:41 +0100)
committer
Wolfgang Denk
<wd@denx.de>
Wed, 9 Jan 2008 21:41:02 +0000
(22:41 +0100)
board/tqm5200/tqm5200.c
patch
|
blob
|
history
cpu/pxa/usb.c
patch
|
blob
|
history
diff --git
a/board/tqm5200/tqm5200.c
b/board/tqm5200/tqm5200.c
index f33d17258ded641ee8c889be33acee964b603338..905a04338e70068f75b1325d648beca2fabdd415 100644
(file)
--- 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 72b7dfadfe70ff2e180458c434e588cc31c45693..aa6f4b7b9d15b940b3e44034e30b6a66b7f67ba9 100644
(file)
--- 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;
}