diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-04-19 13:17:20 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-04-19 13:17:20 +0100 |
| commit | ee89bf2782406b1f87088b4764aeb6f811d82526 (patch) | |
| tree | b144476f4b5e92a414efff165d214d34062d4365 /cpu/ppc4xx/usb_ohci.c | |
| parent | 9c00dfb0bf89c8c23e8af5b5bdf49cf66d769f85 (diff) | |
| parent | 37837828d89084879bee2f2b8c7c68d4695940df (diff) | |
| download | u-boot-imx-ee89bf2782406b1f87088b4764aeb6f811d82526.zip u-boot-imx-ee89bf2782406b1f87088b4764aeb6f811d82526.tar.gz u-boot-imx-ee89bf2782406b1f87088b4764aeb6f811d82526.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu/ppc4xx/usb_ohci.c')
| -rw-r--r-- | cpu/ppc4xx/usb_ohci.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpu/ppc4xx/usb_ohci.c b/cpu/ppc4xx/usb_ohci.c index ab852c5..c71a6a9 100644 --- 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) -#if defined(CONFIG_440EP) || defined(CONFIG_440EPX) +#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 @@ -1601,7 +1601,7 @@ int usb_lowlevel_init(void) gohci.irq = -1; #if defined(CONFIG_440EP) gohci.regs = (struct ohci_regs *)(CFG_PERIPHERAL_BASE | 0x1000); -#elif defined(CONFIG_440EPX) +#elif defined(CONFIG_440EPX) || defined(CFG_USB_HOST) gohci.regs = (struct ohci_regs *)(CFG_USB_HOST); #endif @@ -1625,8 +1625,10 @@ int usb_lowlevel_init(void) ohci_inited = 1; urb_finished = 1; +#if defined(CONFIG_440EP) || defined(CONFIG_440EPX) /* init the device driver */ usb_dev_init(); +#endif return 0; } |