diff options
Diffstat (limited to 'firmware/target/arm/usb-fw-pp502x.c')
-rw-r--r-- | firmware/target/arm/usb-fw-pp502x.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c index 46a5b9942f..4ac515ba1c 100644 --- a/firmware/target/arm/usb-fw-pp502x.c +++ b/firmware/target/arm/usb-fw-pp502x.c | |||
@@ -34,6 +34,7 @@ void usb_init_device(void) | |||
34 | { | 34 | { |
35 | /* enable usb module */ | 35 | /* enable usb module */ |
36 | outl(inl(0x7000002C) | 0x3000000, 0x7000002C); | 36 | outl(inl(0x7000002C) | 0x3000000, 0x7000002C); |
37 | |||
37 | DEV_EN |= DEV_USB0; | 38 | DEV_EN |= DEV_USB0; |
38 | DEV_EN |= DEV_USB1; | 39 | DEV_EN |= DEV_USB1; |
39 | 40 | ||
@@ -46,6 +47,7 @@ void usb_init_device(void) | |||
46 | #if CONFIG_CPU == PP5020 | 47 | #if CONFIG_CPU == PP5020 |
47 | DEV_INIT2 |= INIT_USB; | 48 | DEV_INIT2 |= INIT_USB; |
48 | #endif | 49 | #endif |
50 | |||
49 | while ((inl(0x70000028) & 0x80) == 0); | 51 | while ((inl(0x70000028) & 0x80) == 0); |
50 | outl(inl(0x70000028) | 0x2, 0x70000028); | 52 | outl(inl(0x70000028) | 0x2, 0x70000028); |
51 | udelay(0x186A0); | 53 | udelay(0x186A0); |
@@ -68,9 +70,8 @@ void usb_init_device(void) | |||
68 | void usb_enable(bool on) | 70 | void usb_enable(bool on) |
69 | { | 71 | { |
70 | if (on) { | 72 | if (on) { |
71 | #ifdef USE_ROCKBOX_USB | ||
72 | usb_core_init(); | 73 | usb_core_init(); |
73 | #else | 74 | #if !defined(USE_ROCKBOX_USB) |
74 | /* until we have native mass-storage mode, we want to reboot on | 75 | /* until we have native mass-storage mode, we want to reboot on |
75 | usb host connect */ | 76 | usb host connect */ |
76 | #if defined(IRIVER_H10) || defined (IRIVER_H10_5GB) | 77 | #if defined(IRIVER_H10) || defined (IRIVER_H10_5GB) |