summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2015-11-04 16:40:36 +0800
committerMax Krummenacher <max.krummenacher@toradex.com>2016-02-17 10:54:05 +0100
commite37fd5e3c3cdfce34f4301df053a74b97ee7b9a8 (patch)
tree529779b8ed7123dd5ba9ca4a6172e8a6b300bc3b
parenteb22e2a1199c28a05a64e7cfb9912151622e8b66 (diff)
MLK-11823 USB:gadget Fix USB port interface issue in ci_udc driver
The ci_udc driver tries to use the ULPI interface for the USB OTG controller, but this type is not supported by all i.MX6 and i.MX7 platforms. When setting to ULPI, other platforms except the 6UL refuse the settings and keep default value. But on 6UL, the PTW bit of PORTSC1 register which is documented as RO can change. This cause the interface setting problem with USB PHY. Fix the issue by removing the ULPI setting for i.MX6 and i.MX7. All will use default UTMI setting. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit f78cbee0375dcb81b10bac2e0dcd254d0551baa9)
-rw-r--r--drivers/usb/gadget/ci_udc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index 1dd8b11e87..70ac819c5a 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -888,7 +888,7 @@ 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) || defined(CONFIG_USB_EHCI_MX7)
+#if 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