projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fdt_support: Add multi-serial support for stdout fixup
[oweals/u-boot.git]
/
cpu
/
mpc5xxx
/
usb.c
diff --git
a/cpu/mpc5xxx/usb.c
b/cpu/mpc5xxx/usb.c
index ce709fc652c91d76234d6c762a36b948994b9140..bec7da3eab230baa483db96afbedd32f11beb3e6 100644
(file)
--- a/
cpu/mpc5xxx/usb.c
+++ b/
cpu/mpc5xxx/usb.c
@@
-23,32
+23,36
@@
#include <common.h>
#include <common.h>
-#if defined(CONFIG_USB_OHCI_NEW) && defined(C
FG
_USB_OHCI_CPU_INIT)
+#if defined(CONFIG_USB_OHCI_NEW) && defined(C
ONFIG_SYS
_USB_OHCI_CPU_INIT)
#include <mpc5xxx.h>
#include <mpc5xxx.h>
-int usb_cpu_init()
+int usb_cpu_init(
void
)
{
/* Set the USB Clock */
*(vu_long *)MPC5XXX_CDM_48_FDC = CONFIG_USB_CLOCK;
{
/* Set the USB Clock */
*(vu_long *)MPC5XXX_CDM_48_FDC = CONFIG_USB_CLOCK;
+#ifdef CONFIG_PSC3_USB /* USB is using the alternate configuration */
+ /* remove all PSC3 USB bits first before ORing in ours */
+ *(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00804f00;
+#else
/* remove all USB bits first before ORing in ours */
*(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00807000;
/* remove all USB bits first before ORing in ours */
*(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00807000;
-
+#endif
/* Activate USB port */
*(vu_long *)MPC5XXX_GPS_PORT_CONFIG |= CONFIG_USB_CONFIG;
return 0;
}
/* Activate USB port */
*(vu_long *)MPC5XXX_GPS_PORT_CONFIG |= CONFIG_USB_CONFIG;
return 0;
}
-int usb_cpu_stop()
+int usb_cpu_stop(
void
)
{
return 0;
}
{
return 0;
}
-int usb_cpu_init_fail()
+int usb_cpu_init_fail(
void
)
{
return 0;
}
{
return 0;
}
-#endif /* defined(CONFIG_USB_OHCI) && defined(C
FG
_USB_OHCI_CPU_INIT) */
+#endif /* defined(CONFIG_USB_OHCI) && defined(C
ONFIG_SYS
_USB_OHCI_CPU_INIT) */