Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / drivers / usb / host / xhci-omap.c

diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c
index 104e7a7282cf0b7787afac90ab5f8d1a7c55bfe2..d6c5744818404d30073bda0f3062b507c0284f9e 100644 (file)
--- a/drivers/usb/host/xhci-omap.c
+++ b/drivers/usb/host/xhci-omap.c
@@ -11,7 +11,7 @@
 
 #include <common.h>
 #include <usb.h>
-#include <asm-generic/errno.h>
+#include <linux/errno.h>
 #include <asm/omap_common.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/sys_proto.h>
@@ -27,12 +27,27 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static struct omap_xhci omap;
 
-inline int __board_usb_init(int index, enum usb_init_type init)
+__weak int omap_xhci_board_usb_init(int index, enum usb_init_type init)
 {
+       enable_usb_clocks(index);
        return 0;
 }
+
 int board_usb_init(int index, enum usb_init_type init)
-       __attribute__((weak, alias("__board_usb_init")));
+{
+       return omap_xhci_board_usb_init(index, init);
+}
+
+__weak int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init)
+{
+       disable_usb_clocks(index);
+       return 0;
+}
+
+int board_usb_cleanup(int index, enum usb_init_type init)
+{
+       return omap_xhci_board_usb_cleanup(index, init);
+}
 
 static int omap_xhci_core_init(struct omap_xhci *omap)
 {