mfd: Make omap-usb-host TLL mode work again
authorAnand Gadiyar <gadiyar@ti.com>
Thu, 18 Aug 2011 10:44:31 +0000 (16:14 +0530)
committerSamuel Ortiz <sameo@linux.intel.com>
Tue, 6 Sep 2011 14:37:59 +0000 (16:37 +0200)
This code section seems to have been accidentally copy pasted.
It causes incorrect bits to be set up in the TLL_CHANNEL_CONF
register and prevents the TLL mode from working correctly.

Cc: stable@kernel.org
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Keshava Munegowda <keshava_mgowda@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/omap-usb-host.c

index 29601e7d606dc425591205597817cc19935066a4..0f19ab14de882c850e15e148b0614aa15277c573 100644 (file)
@@ -676,7 +676,6 @@ static void usbhs_omap_tll_init(struct device *dev, u8 tll_channel_count)
                                | OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
                                | OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
 
-                       reg |= (1 << (i + 1));
                } else
                        continue;