diff options
| author | Stefan Roese <sr@denx.de> | 2007-03-21 14:38:25 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-03-21 14:38:25 +0100 |
| commit | fc1e45ce6e45d5d88a42f4245b2d7ee134270029 (patch) | |
| tree | 830b3d19394f8af0d796a0d60dc07a03b6012f85 /cpu/ppc4xx/usb_ohci.c | |
| parent | 8423e5e31a7235d05a482627315fb11d49c17bd7 (diff) | |
| parent | 16c0cc1c82081a493ab87c51980b28336ce1bce8 (diff) | |
| download | u-boot-imx-fc1e45ce6e45d5d88a42f4245b2d7ee134270029.zip u-boot-imx-fc1e45ce6e45d5d88a42f4245b2d7ee134270029.tar.gz u-boot-imx-fc1e45ce6e45d5d88a42f4245b2d7ee134270029.tar.bz2 | |
Merge with /home/stefan/git/u-boot/acadia
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; } |