diff mbox

[2/4,OMAP] omap_udc: Updates for omap7xx IRQs and config

Message ID 6cb013310910050750q183abe82qbfd60064d774fe62@mail.gmail.com (mailing list archive)
State Accepted, archived
Delegated to: Tony Lindgren
Headers show

Commit Message

Cory Maccarrone Oct. 5, 2009, 2:50 p.m. UTC
None
diff mbox

Patch

diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c
index 3c40b85..1ac252a 100644
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
@@ -159,11 +159,14 @@  static u32 __init omap_usb0_init(unsigned
nwires, unsigned is_device)
 		 *  - OTG support on this port not yet written
 		 */

-		l = omap_readl(USB_TRANSCEIVER_CTRL);
-		l &= ~(7 << 4);
-		if (!is_device)
-			l |= (3 << 1);
-		omap_writel(l, USB_TRANSCEIVER_CTRL);
+		/* Don't do this for omap7xx -- it causes USB to not work correctly */
+		if (!cpu_is_omap7xx()) {
+			l = omap_readl(USB_TRANSCEIVER_CTRL);
+			l &= ~(7 << 4);
+			if (!is_device)
+				l |= (3 << 1);
+			omap_writel(l, USB_TRANSCEIVER_CTRL);
+		}

 		return 3 << 16;