summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAnand Gadiyar <gadiyar@ti.com>2011-08-18 16:14:31 +0530
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-03 11:40:27 -0700
commit1e6ad9a39701e09f93d2726ef3602e05f5787ff1 (patch)
tree9c5ae887d59be332046b5f9bb140857e21a432bc /drivers/mfd
parentfbb3afe05e2664dd265b002a4c0992c45bb885a7 (diff)
mfd: Make omap-usb-host TLL mode work again
commit e600cffe618ff0da29ae1f8b8d3824ce0e2409fc upstream. 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. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/omap-usb-host.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 1717144fe7f4..e67c3d3e38b3 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -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;