aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorAjay Kumar Gupta <ajay.gupta@ti.com>2010-05-04 03:45:23 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-20 16:21:40 -0400
commit97dc7c61f1a25e906c0eb65fac2573e1ce063d63 (patch)
tree27aabe41f03ad8d4f35613c55d94b6f9d4b18f97 /drivers/usb/host
parent289621c31bffb743e4007f6332b9004cdd080644 (diff)
USB: ehci-omap: fix Si version related programming
AM3517 is based on ES3.1 thus ES2.x related programming is invalid for it so updating ES2.x programming. Also fixed below checkpatch warning: WARNING: unnecessary whitespace before a quoted newline Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ehci-omap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 711332ebdab5..992d963b91fc 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -352,8 +352,8 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
352 reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS; 352 reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;
353 353
354 /* Bypass the TLL module for PHY mode operation */ 354 /* Bypass the TLL module for PHY mode operation */
355 if (omap_rev() <= OMAP3430_REV_ES2_1) { 355 if (cpu_is_omap3430() && (omap_rev() <= OMAP3430_REV_ES2_1)) {
356 dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1 \n"); 356 dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1\n");
357 if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) || 357 if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) ||
358 (omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) || 358 (omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) ||
359 (omap->port_mode[2] == EHCI_HCD_OMAP_MODE_PHY)) 359 (omap->port_mode[2] == EHCI_HCD_OMAP_MODE_PHY))