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

[u-boot] / drivers / usb / gadget / ci_udc.c

diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index 1ba5054965f05d9a9a2281b2a1bcc97ce1a79224..05c01ce5d6ea31d90b1f23987bdc0e267fe526f1 100644 (file)
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -14,7 +14,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <linux/types.h>
@@ -1018,18 +1018,10 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
                return ret;
 
        ret = ci_udc_probe();
-#if defined(CONFIG_USB_EHCI_MX6) || defined(CONFIG_USB_EHCI_MXS)
-       /*
-        * FIXME: usb_lowlevel_init()->ehci_hcd_init() should be doing all
-        * HW-specific initialization, e.g. ULPI-vs-UTMI PHY selection
-        */
-       if (!ret) {
-               struct ci_udc *udc = (struct ci_udc *)controller.ctrl->hcor;
-
-               /* select ULPI phy */
-               writel(PTS(PTS_ENABLE) | PFSC, &udc->portsc);
+       if (ret) {
+               DBG("udc probe failed, returned %d\n", ret);
+               return ret;
        }
-#endif
 
        ret = driver->bind(&controller.gadget);
        if (ret) {