From 74a27311ed19552d109e1715dd827337fe5dc96c Mon Sep 17 00:00:00 2001
From: Anand Gadiyar <gadiyar@ti.com>
Date: Mon, 24 Aug 2009 17:36:37 +0530
Subject: [PATCH] --- yaml --- r: 163137 b: refs/heads/master c:
 bbde6ebae6dacf2f6e6ac4ab28c1805a2d51c5e1 h: refs/heads/master i:   163135:
 b87cc041a1b4b26ab641c21da8057d59d1e9381a v: v3

---
 [refs]                               |  2 +-
 trunk/arch/arm/mach-omap2/usb-musb.c | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 2db980b9d737..189771592485 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24bcadb6508b7c0f7307749228841fe04af6d70f
+refs/heads/master: bbde6ebae6dacf2f6e6ac4ab28c1805a2d51c5e1
diff --git a/trunk/arch/arm/mach-omap2/usb-musb.c b/trunk/arch/arm/mach-omap2/usb-musb.c
index 739e59e8025c..1145a2562b0f 100644
--- a/trunk/arch/arm/mach-omap2/usb-musb.c
+++ b/trunk/arch/arm/mach-omap2/usb-musb.c
@@ -31,15 +31,6 @@
 #include <mach/mux.h>
 #include <mach/usb.h>
 
-#define OTG_SYSCONFIG	(OMAP34XX_HSUSB_OTG_BASE + 0x404)
-
-static void __init usb_musb_pm_init(void)
-{
-	/* Ensure force-idle mode for OTG controller */
-	if (cpu_is_omap34xx())
-		omap_writel(0, OTG_SYSCONFIG);
-}
-
 #ifdef CONFIG_USB_MUSB_SOC
 
 static struct resource musb_resources[] = {
@@ -173,13 +164,10 @@ void __init usb_musb_init(void)
 		printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
 		return;
 	}
-
-	usb_musb_pm_init();
 }
 
 #else
 void __init usb_musb_init(void)
 {
-	usb_musb_pm_init();
 }
 #endif /* CONFIG_USB_MUSB_SOC */