[PATCH] ehci: fix port connect status programming

[PATCH] ehci: fix port connect status programming

[Ajay Kumar Gupta]

Current programming takes the default vaule of HSUSB port status
from UHH_HOSTCONFIG and write back the same to UHH_HOSTCONFIG
without updating.

This patch updates the port status based on board configuration.

Without this patch EHCI port becomes unusable on OMAP3EVM when a
USB HDD is connected to it through a HS HUB and we get below
error message,

"hub 1-0:1.0: Cannot enable port 1.  Maybe the USB cable is bad?"

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
---
Patch created against ehci branch.
 drivers/usb/host/ehci-omap.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 45b8a7c..f25e1b1 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -108,6 +108,9 @@
 #define OMAP_UHH_HOSTCONFIG_INCR8_BURST_EN		(1 << 3)
 #define OMAP_UHH_HOSTCONFIG_INCR16_BURST_EN		(1 << 4)
 #define OMAP_UHH_HOSTCONFIG_INCRX_ALIGN_EN		(1 << 5)
+#define OMAP_UHH_HOSTCONFIG_P1_CONNECT_STATUS		(1 << 8)
+#define OMAP_UHH_HOSTCONFIG_P2_CONNECT_STATUS		(1 << 9)
+#define OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS		(1 << 10)
 
 #define	OMAP_UHH_DEBUG_CSR				(0x44)
 
@@ -335,6 +338,13 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
 			| OMAP_UHH_HOSTCONFIG_INCR16_BURST_EN);
 	reg &= ~OMAP_UHH_HOSTCONFIG_INCRX_ALIGN_EN;
 
+	if (omap->port_mode[0] == EHCI_HCD_OMAP_MODE_UNKNOWN)
+		reg &= ~OMAP_UHH_HOSTCONFIG_P1_CONNECT_STATUS;
+	if (omap->port_mode[1] == EHCI_HCD_OMAP_MODE_UNKNOWN)
+		reg &= ~OMAP_UHH_HOSTCONFIG_P2_CONNECT_STATUS;
+	if (omap->port_mode[2] == EHCI_HCD_OMAP_MODE_UNKNOWN)
+		reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;
+
 	/* Bypass the TLL module for PHY mode operation */
 	 if (omap_rev() <= OMAP3430_REV_ES2_1) {
 		dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1 \n");
-- 
1.6.2.4

[APPLIED] [PATCH] ehci: fix port connect status programming

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: ehci

Initial commit ID (Likely to change): b353e8445b1ad54e744b8452573b82c5a220d43e

PatchWorks
http://patchwork.kernel.org/patch/53393/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=b353e8445b1ad54e744b8452573b82c5a220d43e