projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with git://www.denx.de/git/u-boot-testing
[oweals/u-boot.git]
/
cpu
/
ppc4xx
/
usb_ohci.c
diff --git
a/cpu/ppc4xx/usb_ohci.c
b/cpu/ppc4xx/usb_ohci.c
index bb5765891f8c4c3f98aa361f7d11f0ba9949db9d..c71a6a9d85a7adabecaab0306b275e3c3c7b147d 100644
(file)
--- a/
cpu/ppc4xx/usb_ohci.c
+++ b/
cpu/ppc4xx/usb_ohci.c
@@
-76,7
+76,7
@@
#define m16_swap(x) swap_16(x)
#define m32_swap(x) swap_32(x)
#define m16_swap(x) swap_16(x)
#define m32_swap(x) swap_32(x)
-#if
def CONFIG_440EP
+#if
defined(CONFIG_405EZ) || defined(CONFIG_440EP) || defined(CONFIG_440EPX)
#define ohci_cpu_to_le16(x) (x)
#define ohci_cpu_to_le32(x) (x)
#else
#define ohci_cpu_to_le16(x) (x)
#define ohci_cpu_to_le32(x) (x)
#else
@@
-1599,7
+1599,11
@@
int usb_lowlevel_init(void)
gohci.disabled = 1;
gohci.sleeping = 0;
gohci.irq = -1;
gohci.disabled = 1;
gohci.sleeping = 0;
gohci.irq = -1;
- gohci.regs = (struct ohci_regs *)(CFG_PERIPHERAL_BASE | 0x1000);
+#if defined(CONFIG_440EP)
+ gohci.regs = (struct ohci_regs *)(CFG_PERIPHERAL_BASE | 0x1000);
+#elif defined(CONFIG_440EPX) || defined(CFG_USB_HOST)
+ gohci.regs = (struct ohci_regs *)(CFG_USB_HOST);
+#endif
gohci.flags = 0;
gohci.slot_name = "ppc440";
gohci.flags = 0;
gohci.slot_name = "ppc440";
@@
-1621,8
+1625,10
@@
int usb_lowlevel_init(void)
ohci_inited = 1;
urb_finished = 1;
ohci_inited = 1;
urb_finished = 1;
+#if defined(CONFIG_440EP) || defined(CONFIG_440EPX)
/* init the device driver */
usb_dev_init();
/* init the device driver */
usb_dev_init();
+#endif
return 0;
}
return 0;
}