diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2006-05-23 13:38:35 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2006-05-23 13:38:35 +0200 |
| commit | 301f1aa384d0edcae6a22fd9adb933ad71695ecc (patch) | |
| tree | 6372c981f149c1baac612c71ff7d994a097071e0 /drivers/usb_ohci.c | |
| parent | 24e37645e7378b20fa8f20e2996c8fb8e90c70c9 (diff) | |
| download | u-boot-imx-301f1aa384d0edcae6a22fd9adb933ad71695ecc.zip u-boot-imx-301f1aa384d0edcae6a22fd9adb933ad71695ecc.tar.gz u-boot-imx-301f1aa384d0edcae6a22fd9adb933ad71695ecc.tar.bz2 | |
Changed the mp2usb (at91rm9200) board to use the generic OHCI driver. Some
fixes to the latter.
Diffstat (limited to 'drivers/usb_ohci.c')
| -rw-r--r-- | drivers/usb_ohci.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb_ohci.c b/drivers/usb_ohci.c index f5af719..c32245a 100644 --- a/drivers/usb_ohci.c +++ b/drivers/usb_ohci.c @@ -1552,13 +1552,13 @@ static char ohci_inited = 0; int usb_lowlevel_init(void) { -#if CFG_USB_CPU_INIT +#if CFG_USB_OHCI_CPU_INIT /* cpu dependant init */ if(usb_cpu_init()) return -1; #endif -#if CFG_USB_BOARD_INIT +#if CFG_USB_OHCI_BOARD_INIT /* board dependant init */ if(usb_board_init()) return -1; @@ -1593,18 +1593,18 @@ int usb_lowlevel_init(void) gohci.regs = (struct ohci_regs *)CFG_USB_OHCI_REGS_BASE; gohci.flags = 0; - gohci.slot_name = CFG_USB_SLOT_NAME; + gohci.slot_name = CFG_USB_OHCI_SLOT_NAME; if (hc_reset (&gohci) < 0) { hc_release_ohci (&gohci); err ("can't reset usb-%s", gohci.slot_name); /* Initialization failed disable clocks */ -#if CFG_USB_BOARD_INIT +#if CFG_USB_OHCI_BOARD_INIT /* board dependant cleanup */ usb_board_stop(); #endif -#if CFG_USB_CPU_INIT +#if CFG_USB_OHCI_CPU_INIT /* cpu dependant cleanup */ usb_cpu_stop(); #endif @@ -1618,12 +1618,12 @@ int usb_lowlevel_init(void) err ("can't start usb-%s", gohci.slot_name); hc_release_ohci (&gohci); /* Initialization failed */ -#if CFG_USB_BOARD_INIT +#if CFG_USB_OHCI_BOARD_INIT /* board dependant cleanup */ usb_board_stop(); #endif -#if CFG_USB_CPU_INIT +#if CFG_USB_OHCI_CPU_INIT /* cpu dependant cleanup */ usb_cpu_stop(); #endif @@ -1649,13 +1649,13 @@ int usb_lowlevel_stop(void) /* call hc_release_ohci() here ? */ hc_reset (&gohci); -#if CFG_USB_BOARD_INIT +#if CFG_USB_OHCI_BOARD_INIT /* board dependant cleanup */ if(usb_board_stop()) return -1; #endif -#if CFG_USB_CPU_INIT +#if CFG_USB_OHCI_CPU_INIT /* cpu dependant cleanup */ if(usb_cpu_stop()) return -1; |