projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Coding Style cleanup
[oweals/u-boot.git]
/
drivers
/
usb
/
host
/
ehci-mx5.c
diff --git
a/drivers/usb/host/ehci-mx5.c
b/drivers/usb/host/ehci-mx5.c
index 7b881371d8526c59d34ecfaf4e042ef7cb1fff57..58cdcbedf273c013e509faf8deae3f5d5beda175 100644
(file)
--- a/
drivers/usb/host/ehci-mx5.c
+++ b/
drivers/usb/host/ehci-mx5.c
@@
-22,6
+22,7
@@
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/mx5x_pins.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/mx5x_pins.h>
+#include <asm/arch/iomux.h>
#include "ehci.h"
#include "ehci-core.h"
#include "ehci.h"
#include "ehci-core.h"
@@
-198,6
+199,13
@@
int mxc_set_usbcontrol(int port, unsigned int flags)
return ret;
}
return ret;
}
+void __board_ehci_hcd_postinit(struct usb_ehci *ehci, int port)
+{
+}
+
+void board_ehci_hcd_postinit(struct usb_ehci *ehci, int port)
+ __attribute((weak, alias("__board_ehci_hcd_postinit")));
+
int ehci_hcd_init(void)
{
struct usb_ehci *ehci;
int ehci_hcd_init(void)
{
struct usb_ehci *ehci;
@@
-217,7
+225,7
@@
int ehci_hcd_init(void)
enable_usb_phy2_clk(1);
mdelay(1);
enable_usb_phy2_clk(1);
mdelay(1);
- /*
d
o board specific initialization */
+ /*
D
o board specific initialization */
board_ehci_hcd_init(CONFIG_MXC_USB_PORT);
ehci = (struct usb_ehci *)(OTG_BASE_ADDR +
board_ehci_hcd_init(CONFIG_MXC_USB_PORT);
ehci = (struct usb_ehci *)(OTG_BASE_ADDR +
@@
-231,9
+239,11
@@
int ehci_hcd_init(void)
setbits_le32(&ehci->portsc, USB_EN);
mxc_set_usbcontrol(CONFIG_MXC_USB_PORT, CONFIG_MXC_USB_FLAGS);
setbits_le32(&ehci->portsc, USB_EN);
mxc_set_usbcontrol(CONFIG_MXC_USB_PORT, CONFIG_MXC_USB_FLAGS);
-
mdelay(10);
mdelay(10);
+ /* Do board specific post-initialization */
+ board_ehci_hcd_postinit(ehci, CONFIG_MXC_USB_PORT);
+
return 0;
}
return 0;
}
@@
-241,5
+251,3
@@
int ehci_hcd_stop(void)
{
return 0;
}
{
return 0;
}
-
-