Merge tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[mirror_ubuntu-bionic-kernel.git] / drivers / mfd / omap-usb-tll.c

diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
index 1aa74c4c3ced91e6c452a5e9f9e32b8f8597ea82..6f5300b0eb316a3ec68600a1aaf846fbf99d6a8f 100644 (file)
--- a/drivers/mfd/omap-usb-tll.c
+++ b/drivers/mfd/omap-usb-tll.c
@@ -373,12 +373,13 @@ int omap_tll_init(struct usbhs_omap_platform_data *pdata)
                        } else if (pdata->port_mode[i] ==
                                        OMAP_EHCI_PORT_MODE_TLL) {
                                /*
-                                * Disable AutoIdle, BitStuffing
-                                * and use SDR Mode
+                                * Disable UTMI AutoIdle, BitStuffing
+                                * and use SDR Mode. Enable ULPI AutoIdle.
                                 */
                                reg &= ~(OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE
-                                       | OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
                                        | OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
+                               reg |= OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF;
+                               reg |= OMAP_TLL_CHANNEL_CONF_ULPI_ULPIAUTOIDLE;
                        } else if (pdata->port_mode[i] ==
                                        OMAP_EHCI_PORT_MODE_HSIC) {
                                /*