summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-12-16 11:28:10 -0800
committerTony Lindgren <tony@atomide.com>2012-12-16 11:28:10 -0800
commit2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4 (patch)
tree04857b183cef8996c7380ebc8a83b5110c71e15d /drivers/mfd
parentd7dde8c191d136415819e4456e21f2b0cc00c326 (diff)
parentd9ba573718666df2e7e30d671f81bba39d07f91c (diff)
downloadlinux-stable-2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4.tar.gz
linux-stable-2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4.tar.bz2
linux-stable-2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4.zip
Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/omap-usb-host.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 770a0d01e0b9..05164d7f054b 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -25,7 +25,6 @@
#include <linux/dma-mapping.h>
#include <linux/spinlock.h>
#include <linux/gpio.h>
-#include <plat/cpu.h>
#include <linux/platform_device.h>
#include <linux/platform_data/usb-omap.h>
#include <linux/pm_runtime.h>
@@ -384,7 +383,7 @@ static void omap_usbhs_init(struct device *dev)
reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;
/* Bypass the TLL module for PHY mode operation */
- if (cpu_is_omap3430() && (omap_rev() <= OMAP3430_REV_ES2_1)) {
+ if (pdata->single_ulpi_bypass) {
dev_dbg(dev, "OMAP3 ES version <= ES2.1\n");
if (is_ehci_phy_mode(pdata->port_mode[0]) ||
is_ehci_phy_mode(pdata->port_mode[1]) ||