projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
[oweals/u-boot.git]
/
cpu
/
ppc4xx
/
usb_ohci.c
diff --git
a/cpu/ppc4xx/usb_ohci.c
b/cpu/ppc4xx/usb_ohci.c
index ab852c525cf73403483cf0159e1ff18e75324d0b..5dbd84227453c455fe48179a67ae7ca7e9d16877 100644
(file)
--- a/
cpu/ppc4xx/usb_ohci.c
+++ b/
cpu/ppc4xx/usb_ohci.c
@@
-56,8
+56,8
@@
#define OHCI_CONTROL_INIT \
(OHCI_CTRL_CBSR & 0x3) | OHCI_CTRL_IE | OHCI_CTRL_PLE
#define OHCI_CONTROL_INIT \
(OHCI_CTRL_CBSR & 0x3) | OHCI_CTRL_IE | OHCI_CTRL_PLE
-#define readl(a) (*((v
u_long
*)(a)))
-#define writel(a, b) (*((v
u_long *)(b)) = ((vu_long
)a))
+#define readl(a) (*((v
olatile u32
*)(a)))
+#define writel(a, b) (*((v
olatile u32 *)(b)) = ((volatile u32
)a))
#define min_t(type,x,y) ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; })
#define min_t(type,x,y) ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; })
@@
-76,7
+76,7
@@
#define m16_swap(x) swap_16(x)
#define m32_swap(x) swap_32(x)
#define m16_swap(x) swap_16(x)
#define m32_swap(x) swap_32(x)
-#if defined(CONFIG_440EP) || defined(CONFIG_440EPX)
+#if defined(CONFIG_4
05EZ) || defined(CONFIG_4
40EP) || defined(CONFIG_440EPX)
#define ohci_cpu_to_le16(x) (x)
#define ohci_cpu_to_le32(x) (x)
#else
#define ohci_cpu_to_le16(x) (x)
#define ohci_cpu_to_le32(x) (x)
#else
@@
-1600,8
+1600,8
@@
int usb_lowlevel_init(void)
gohci.sleeping = 0;
gohci.irq = -1;
#if defined(CONFIG_440EP)
gohci.sleeping = 0;
gohci.irq = -1;
#if defined(CONFIG_440EP)
- gohci.regs = (struct ohci_regs *)(CFG_PERIPHERAL_BASE | 0x1000);
-#elif defined(CONFIG_440EPX)
+ gohci.regs = (struct ohci_regs *)(CFG_PERIPHERAL_BASE | 0x1000);
+#elif defined(CONFIG_440EPX)
|| defined(CFG_USB_HOST)
gohci.regs = (struct ohci_regs *)(CFG_USB_HOST);
#endif
gohci.regs = (struct ohci_regs *)(CFG_USB_HOST);
#endif
@@
-1625,8
+1625,10
@@
int usb_lowlevel_init(void)
ohci_inited = 1;
urb_finished = 1;
ohci_inited = 1;
urb_finished = 1;
+#if defined(CONFIG_440EP) || defined(CONFIG_440EPX)
/* init the device driver */
usb_dev_init();
/* init the device driver */
usb_dev_init();
+#endif
return 0;
}
return 0;
}