USB: ehci-omap: fix Si version related programming
authorAjay Kumar Gupta <ajay.gupta@ti.com>
Tue, 4 May 2010 07:45:23 +0000 (13:15 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 20 May 2010 20:21:40 +0000 (13:21 -0700)
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>
drivers/usb/host/ehci-omap.c

index 711332ebdab5b0408343d7960baf0b3e01f53b80..992d963b91fc1a713a1f533104fa22a82f636118 100644 (file)
@@ -352,8 +352,8 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
                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");
+       if (cpu_is_omap3430() && (omap_rev() <= OMAP3430_REV_ES2_1)) {
+               dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1\n");
                if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) ||
                        (omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) ||
                                (omap->port_mode[2] == EHCI_HCD_OMAP_MODE_PHY))