diff options
| author | Stefan Roese <sr@denx.de> | 2006-09-18 10:48:03 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-09-18 10:48:03 +0200 |
| commit | 64cd52efd1dc51a4a5a0cf10efe5362fab27de29 (patch) | |
| tree | 64e046a7d8b2f0106bc387dd032734ad963f4e68 /cpu/ppc4xx/usbdev.c | |
| parent | 899620c2d66d4eef3b2a0034d062e71d45d886c9 (diff) | |
| parent | 854bc8da75709f13dab4cfa6e9094c0cb49b5c5a (diff) | |
| download | blackbird-obmc-uboot-64cd52efd1dc51a4a5a0cf10efe5362fab27de29.tar.gz blackbird-obmc-uboot-64cd52efd1dc51a4a5a0cf10efe5362fab27de29.zip | |
Merge with /home/stefan/git/u-boot/denx
Diffstat (limited to 'cpu/ppc4xx/usbdev.c')
| -rw-r--r-- | cpu/ppc4xx/usbdev.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/cpu/ppc4xx/usbdev.c b/cpu/ppc4xx/usbdev.c index 8262c54bef..6140d2a908 100644 --- a/cpu/ppc4xx/usbdev.c +++ b/cpu/ppc4xx/usbdev.c @@ -3,7 +3,7 @@ #include <common.h> #include <asm/processor.h> -#ifdef CONFIG_440EP +#if (defined(CONFIG_440EP) || defined(CONFIG_440EPX)) && (CONFIG_COMMANDS & CFG_CMD_USB) #include <usb.h> #include "usbdev.h" @@ -186,6 +186,21 @@ int usbInt(void) return 0; } +#if defined(CONFIG_440EPX) +void usb_dev_init() +{ + printf("USB 2.0 Device init\n"); + + /*usb dev init */ + *(unsigned char *)USB2D0_POWER_8 = 0xa1; /* 2.0 */ + + /*enable interrupts */ + *(unsigned char *)USB2D0_INTRUSBE_8 = 0x0f; + + irq_install_handler(VECNUM_HSB2D, (interrupt_handler_t *) usbInt, + NULL); +} +#else void usb_dev_init() { #ifdef USB_2_0_DEVICE @@ -210,5 +225,6 @@ void usb_dev_init() irq_install_handler(VECNUM_USBDEV, (interrupt_handler_t *) usbInt, NULL); } +#endif -#endif /*CONFIG_440EP */ +#endif /* CONFIG_440EP || CONFIG_440EPX */ |
