diff options
| author | Tony Lindgren | 2012-12-16 20:28:10 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2012-12-16 20:28:10 +0100 |
| commit | 2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4 (patch) | |
| tree | 04857b183cef8996c7380ebc8a83b5110c71e15d /drivers/mfd | |
| parent | ARM: OMAP2+: common: remove use of vram (diff) | |
| parent | ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h (diff) | |
| download | kernel-qcow2-linux-2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4.tar.gz kernel-qcow2-linux-2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4.tar.xz kernel-qcow2-linux-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.c | 3 |
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]) || |