From 4de4ee020e9261666b2a4cd8d0e0e468d8b3dc7b Mon Sep 17 00:00:00 2001
From: Hema HK <hemahk@ti.com>
Date: Wed, 7 Sep 2011 09:19:24 -0700
Subject: [PATCH] --- yaml --- r: 280845 b: refs/heads/master c:
 e25bec160158abe86c276d7d206264afc3646281 h: refs/heads/master i:   280843:
 99329e5dced8a75fdd6369a974f16702e95d9bb2 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/musb/musb_core.h | 1 +
 trunk/drivers/usb/musb/omap2430.c  | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c72db5dbcf05..064a7751b1b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea737554451d9fae1207e84a3d2c495bbfcd3f08
+refs/heads/master: e25bec160158abe86c276d7d206264afc3646281
diff --git a/trunk/drivers/usb/musb/musb_core.h b/trunk/drivers/usb/musb/musb_core.h
index b3c065ab9dbc..3259a6bbaba3 100644
--- a/trunk/drivers/usb/musb/musb_core.h
+++ b/trunk/drivers/usb/musb/musb_core.h
@@ -311,6 +311,7 @@ struct musb_context_registers {
 	u8 index, testmode;
 
 	u8 devctl, busctl, misc;
+	u32 otg_interfsel;
 
 	struct musb_csr_regs index_regs[MUSB_C_NUM_EPS];
 };
diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c
index ba85f273e487..78eb13a33796 100644
--- a/trunk/drivers/usb/musb/omap2430.c
+++ b/trunk/drivers/usb/musb/omap2430.c
@@ -491,6 +491,9 @@ static int omap2430_runtime_suspend(struct device *dev)
 	struct omap2430_glue		*glue = dev_get_drvdata(dev);
 	struct musb			*musb = glue_to_musb(glue);
 
+	musb->context.otg_interfsel = musb_readl(musb->mregs,
+						OTG_INTERFSEL);
+
 	omap2430_low_level_exit(musb);
 	otg_set_suspend(musb->xceiv, 1);
 
@@ -503,6 +506,9 @@ static int omap2430_runtime_resume(struct device *dev)
 	struct musb			*musb = glue_to_musb(glue);
 
 	omap2430_low_level_init(musb);
+	musb_writel(musb->mregs, OTG_INTERFSEL,
+					musb->context.otg_interfsel);
+
 	otg_set_suspend(musb->xceiv, 0);
 
 	return 0;