From c47ec1ed54d9acf8a162f633e96f8ecbb675b741 Mon Sep 17 00:00:00 2001
From: Niilo Minkkinen <ext-niilo.1.minkkinen@nokia.com>
Date: Mon, 18 May 2009 17:54:16 +0300
Subject: [PATCH] --- yaml --- r: 151375 b: refs/heads/master c:
 9a4b5e36ce58febdd2039dd4d129ee7edf4f5536 h: refs/heads/master i:   151373:
 69a54fb2d642951811608b7ca34dd2822117b7e3   151371:
 1a7520e49e544968fa02779e95cd3ddfc55d058f   151367:
 0fbd93a6b7b38b29e3ad2d1caaa65c9bd4a9cd62   151359:
 648c969c802571bd696b05af747686e8321be126 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/musb/omap2430.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a2d4ac252855..38decd0d5691 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2bfb4a346d2c2e25f84b35c6044ff53296be1ee
+refs/heads/master: 9a4b5e36ce58febdd2039dd4d129ee7edf4f5536
diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c
index 48930f25c450..34875201ee04 100644
--- a/trunk/drivers/usb/musb/omap2430.c
+++ b/trunk/drivers/usb/musb/omap2430.c
@@ -227,7 +227,12 @@ int __init musb_platform_init(struct musb *musb)
 	l &= ~AUTOIDLE;		/* disable auto idle */
 	l &= ~NOIDLE;		/* remove possible noidle */
 	l |= SMARTIDLE;		/* enable smart idle */
-	l |= AUTOIDLE;		/* enable auto idle */
+	/*
+	 * MUSB AUTOIDLE don't work in 3430.
+	 * Workaround by Richard Woodruff/TI
+	 */
+	if (!cpu_is_omap3430())
+		l |= AUTOIDLE;		/* enable auto idle */
 	omap_writel(l, OTG_SYSCONFIG);
 
 	l = omap_readl(OTG_INTERFSEL);