summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAnand Gadiyar <gadiyar@ti.com>2011-08-18 16:14:31 +0530
committerSamuel Ortiz <sameo@linux.intel.com>2011-09-06 16:37:59 +0200
commite600cffe618ff0da29ae1f8b8d3824ce0e2409fc (patch)
tree33d0dfc77ddf15bcc0a09c79c80e9f88241e6506 /drivers/mfd
parent7eb3154e6caf7945ce60c196637b7ac06213befd (diff)
downloadop-kernel-dev-e600cffe618ff0da29ae1f8b8d3824ce0e2409fc.zip
op-kernel-dev-e600cffe618ff0da29ae1f8b8d3824ce0e2409fc.tar.gz
mfd: Make omap-usb-host TLL mode work again
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>
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 29601e7..0f19ab1 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;
OpenPOWER on IntegriCloud