From 154f4d6a84287f5f978791981d2f1d317efd3027 Mon Sep 17 00:00:00 2001
From: Roger Quadros <rogerq@ti.com>
Date: Fri, 14 Dec 2012 09:09:11 -0800
Subject: [PATCH] --- yaml --- r: 347395 b: refs/heads/master c:
 63b68901dfd590cc13d4fe5c08dec2ca75b3c4aa h: refs/heads/master i:   347393:
 ed3683d07e7cf2d83bdeb0430d6c0190ec2633c1   347391:
 0b19f785dc15d8767cefa3337799cb74f2eba6c8 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/mach-omap2/usb-host.c         | 4 ++++
 trunk/drivers/mfd/omap-usb-host.c            | 3 +--
 trunk/include/linux/platform_data/usb-omap.h | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4205b6972e7e..1b314d12574c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 657b9deeed33cfb6f7171361accc6982727d2e0b
+refs/heads/master: 63b68901dfd590cc13d4fe5c08dec2ca75b3c4aa
diff --git a/trunk/arch/arm/mach-omap2/usb-host.c b/trunk/arch/arm/mach-omap2/usb-host.c
index d1dbe125b34f..2e44e8a22884 100644
--- a/trunk/arch/arm/mach-omap2/usb-host.c
+++ b/trunk/arch/arm/mach-omap2/usb-host.c
@@ -508,6 +508,10 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
 	if (cpu_is_omap34xx()) {
 		setup_ehci_io_mux(pdata->port_mode);
 		setup_ohci_io_mux(pdata->port_mode);
+
+		if (omap_rev() <= OMAP3430_REV_ES2_1)
+			usbhs_data.single_ulpi_bypass = true;
+
 	} else if (cpu_is_omap44xx()) {
 		setup_4430ehci_io_mux(pdata->port_mode);
 		setup_4430ohci_io_mux(pdata->port_mode);
diff --git a/trunk/drivers/mfd/omap-usb-host.c b/trunk/drivers/mfd/omap-usb-host.c
index 770a0d01e0b9..05164d7f054b 100644
--- a/trunk/drivers/mfd/omap-usb-host.c
+++ b/trunk/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]) ||
diff --git a/trunk/include/linux/platform_data/usb-omap.h b/trunk/include/linux/platform_data/usb-omap.h
index 8570bcfe6311..ef65b67c56c3 100644
--- a/trunk/include/linux/platform_data/usb-omap.h
+++ b/trunk/include/linux/platform_data/usb-omap.h
@@ -59,6 +59,9 @@ struct usbhs_omap_platform_data {
 
 	struct ehci_hcd_omap_platform_data	*ehci_data;
 	struct ohci_hcd_omap_platform_data	*ohci_data;
+
+	/* OMAP3 <= ES2.1 have a single ulpi bypass control bit */
+	unsigned				single_ulpi_bypass:1;
 };
 
 /*-------------------------------------------------------------------------*/